Merge branch 'master' of https://github.com/FarmBot/Farmbot-Web-App into staging
commit
1d196d633a
|
@ -263,7 +263,7 @@ export function FbosDetails(props: FbosDetailsProps) {
|
||||||
soc_temp, wifi_level, uptime, memory_usage, disk_usage, throttled,
|
soc_temp, wifi_level, uptime, memory_usage, disk_usage, throttled,
|
||||||
wifi_level_percent, cpu_usage, private_ip,
|
wifi_level_percent, cpu_usage, private_ip,
|
||||||
} = props.botInfoSettings;
|
} = props.botInfoSettings;
|
||||||
const { last_ota, last_ota_checkup } = props.deviceAccount.body;
|
const { last_ota, last_ota_checkup, fbos_version } = props.deviceAccount.body;
|
||||||
const infoFwCommit = firmware_version?.includes(".") ? firmware_commit : "---";
|
const infoFwCommit = firmware_version?.includes(".") ? firmware_commit : "---";
|
||||||
const firmwareCommit = firmware_version?.split("-")[1] || infoFwCommit;
|
const firmwareCommit = firmware_version?.split("-")[1] || infoFwCommit;
|
||||||
|
|
||||||
|
@ -273,6 +273,7 @@ export function FbosDetails(props: FbosDetailsProps) {
|
||||||
botToMqttLastSeen={props.botToMqttLastSeen}
|
botToMqttLastSeen={props.botToMqttLastSeen}
|
||||||
timeSettings={props.timeSettings}
|
timeSettings={props.timeSettings}
|
||||||
device={props.deviceAccount} />
|
device={props.deviceAccount} />
|
||||||
|
<p><b>{t("Version last seen")}: </b>{fbos_version}</p>
|
||||||
<p><b>{t("Environment")}: </b>{env}</p>
|
<p><b>{t("Environment")}: </b>{env}</p>
|
||||||
<CommitDisplay title={t("Commit")}
|
<CommitDisplay title={t("Commit")}
|
||||||
repo={FarmBotRepo.FarmBotOS} commit={commit} />
|
repo={FarmBotRepo.FarmBotOS} commit={commit} />
|
||||||
|
|
|
@ -141,6 +141,13 @@ export function createShouldDisplayFn(
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Temporary hotfix fallback data. Please remove.
|
||||||
|
const fallbackData: MinOsFeatureLookup = {};
|
||||||
|
Object.values(Feature).map(feature =>
|
||||||
|
fallbackData[feature] = globalConfig.FBOS_END_OF_LIFE_VERSION);
|
||||||
|
fallbackData.criteria_groups = "9.2.2";
|
||||||
|
fallbackData.boot_sequence = MinVersionOverride.NEVER;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compare the current FBOS version in the bot's
|
* Compare the current FBOS version in the bot's
|
||||||
* state with the API's fbos_version string and return the greatest version. */
|
* state with the API's fbos_version string and return the greatest version. */
|
||||||
|
|
|
@ -44,7 +44,9 @@ end
|
||||||
def get_base_branch(pull_data)
|
def get_base_branch(pull_data)
|
||||||
current_branch = BASE_BRANCHES.empty? ||
|
current_branch = BASE_BRANCHES.empty? ||
|
||||||
BASE_BRANCHES.include?(CURRENT_BRANCH) ? CURRENT_BRANCH : "staging"
|
BASE_BRANCHES.include?(CURRENT_BRANCH) ? CURRENT_BRANCH : "staging"
|
||||||
pull_data.dig("base", "ref") || current_branch
|
provided_base_branch =
|
||||||
|
CURRENT_BRANCH.start_with?("master-hotfix/") ? "master" : nil;
|
||||||
|
pull_data.dig("base", "ref") || provided_base_branch || current_branch
|
||||||
end
|
end
|
||||||
|
|
||||||
# Gather relevant coverage data.
|
# Gather relevant coverage data.
|
||||||
|
|
Loading…
Reference in New Issue