diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/install.sh | 6 | ||||
| -rw-r--r-- | ci/script.sh | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ci/install.sh b/ci/install.sh index 5997c7cb..bcb7c110 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -3,12 +3,10 @@ set -ex main() { local target= - if [ $TRAVIS_OS_NAME = linux ]; then + if [ $CIRRUS_OS = linux ]; then target=x86_64-unknown-linux-musl - sort=sort else target=x86_64-apple-darwin - sort=gsort # for `sort --sort-version`, from brew's coreutils. fi # Builds for iOS are done on OSX, but require the specific target to be @@ -38,7 +36,7 @@ main() { local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ | cut -d/ -f3 \ | grep -E '^v[0.1.0-9.]+$' \ - | $sort --version-sort \ + | sort --version-sort \ | tail -n1) curl -LSfs https://japaric.github.io/trust/install.sh | \ sh -s -- \ diff --git a/ci/script.sh b/ci/script.sh index e1d1ab7e..f998039a 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -5,8 +5,8 @@ set -ex main() { # Add a cfg spec to allow disabling specific tests under CI. - if [ "$TRAVIS" = true ]; then - export RUSTFLAGS=--cfg=travis + if [ "$CIRRUS_CI" = true ]; then + export RUSTFLAGS=--cfg=cirrus fi IFS=';' read -ra TARGET_ARRAY <<< "$TARGET" @@ -26,6 +26,6 @@ main() { } # we don't run the "test phase" when doing deploys -if [ -z $TRAVIS_TAG ]; then +if [ -z $CIRRUS_TAG ]; then main fi |