commit
9f35dd9992
|
@ -263,7 +263,7 @@ export function FbosDetails(props: FbosDetailsProps) {
|
|||
soc_temp, wifi_level, uptime, memory_usage, disk_usage, throttled,
|
||||
wifi_level_percent, cpu_usage, private_ip,
|
||||
} = 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 firmwareCommit = firmware_version?.split("-")[1] || infoFwCommit;
|
||||
|
||||
|
@ -273,6 +273,7 @@ export function FbosDetails(props: FbosDetailsProps) {
|
|||
botToMqttLastSeen={props.botToMqttLastSeen}
|
||||
timeSettings={props.timeSettings}
|
||||
device={props.deviceAccount} />
|
||||
<p><b>{t("Version last seen")}: </b>{fbos_version}</p>
|
||||
<p><b>{t("Environment")}: </b>{env}</p>
|
||||
<CommitDisplay title={t("Commit")}
|
||||
repo={FarmBotRepo.FarmBotOS} commit={commit} />
|
||||
|
|
|
@ -44,7 +44,9 @@ end
|
|||
def get_base_branch(pull_data)
|
||||
current_branch = BASE_BRANCHES.empty? ||
|
||||
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
|
||||
|
||||
# Gather relevant coverage data.
|
||||
|
|
22
package.json
22
package.json
|
@ -25,15 +25,15 @@
|
|||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/core": "7.9.0",
|
||||
"@blueprintjs/core": "3.25.0",
|
||||
"@blueprintjs/datetime": "3.16.0",
|
||||
"@blueprintjs/select": "3.12.1",
|
||||
"@blueprintjs/core": "3.26.0",
|
||||
"@blueprintjs/datetime": "3.16.1",
|
||||
"@blueprintjs/select": "3.12.2",
|
||||
"@types/enzyme": "3.10.5",
|
||||
"@types/jest": "25.2.1",
|
||||
"@types/lodash": "4.14.149",
|
||||
"@types/lodash": "4.14.150",
|
||||
"@types/markdown-it": "10.0.0",
|
||||
"@types/moxios": "0.4.9",
|
||||
"@types/node": "13.11.1",
|
||||
"@types/node": "13.13.2",
|
||||
"@types/promise-timeout": "1.3.0",
|
||||
"@types/react": "16.9.34",
|
||||
"@types/react-color": "3.0.1",
|
||||
|
@ -42,11 +42,11 @@
|
|||
"axios": "0.19.2",
|
||||
"boxed_value": "1.0.0",
|
||||
"browser-speech": "1.1.1",
|
||||
"coveralls": "3.0.11",
|
||||
"coveralls": "3.0.14",
|
||||
"enzyme": "3.11.0",
|
||||
"enzyme-adapter-react-16": "1.15.2",
|
||||
"farmbot": "10.0.0-rc1",
|
||||
"i18next": "19.4.1",
|
||||
"i18next": "19.4.3",
|
||||
"install": "0.13.0",
|
||||
"lodash": "4.17.15",
|
||||
"markdown-it": "10.0.0",
|
||||
|
@ -71,19 +71,19 @@
|
|||
"redux-thunk": "2.3.0",
|
||||
"sass-lint": "1.13.1",
|
||||
"takeme": "0.11.3",
|
||||
"ts-jest": "25.3.1",
|
||||
"ts-jest": "25.4.0",
|
||||
"ts-lint": "4.5.1",
|
||||
"tslint": "6.1.1",
|
||||
"typescript": "3.8.3",
|
||||
"which": "2.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"jest": "25.3.0",
|
||||
"jest-cli": "25.3.0",
|
||||
"jest": "25.4.0",
|
||||
"jest-cli": "25.4.0",
|
||||
"jest-junit": "10.0.0",
|
||||
"jest-skipped-reporter": "0.0.5",
|
||||
"jshint": "2.11.0",
|
||||
"madge": "3.8.0",
|
||||
"sass": "1.26.3"
|
||||
"sass": "1.26.5"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue