ci: cleanup platform detection

This commit is contained in:
Pietro Albini 2019-10-08 12:05:45 +02:00
parent 102dc3ddc1
commit 4bc4fae073
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C
2 changed files with 6 additions and 6 deletions

View File

@ -117,7 +117,7 @@ make check-bootstrap
# Display the CPU and memory information. This helps us know why the CI timing
# is fluctuating.
if isOSX; then
if isMacOS; then
system_profiler SPHardwareDataType || true
sysctl hw || true
ncpus=$(sysctl -n hw.ncpu)

View File

@ -30,16 +30,16 @@ function isCI {
[ "$CI" = "true" ] || [ "$TF_BUILD" = "True" ]
}
function isOSX {
function isMacOS {
[ "$AGENT_OS" = "Darwin" ]
}
function isMacOS {
isOSX
function isWindows {
[ "$AGENT_OS" = "Windows_NT" ]
}
function isWindows {
[ "$AGENT_OS" = "Windows_NT" ]
function isLinux {
[ "$AGENT_OS" = "Linux" ]
}
function getCIBranch {