diff options
-rw-r--r-- | .travis.yml | 86 | ||||
-rw-r--r-- | appveyor.yml | 2 |
2 files changed, 44 insertions, 44 deletions
diff --git a/.travis.yml b/.travis.yml index 1007aad925d..37e57a9fbfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,16 +13,16 @@ matrix: include: # Images used in testing PR and try-build should be run first. - env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1 - if: type = pull_request OR branch = auto + if: type = pull_request OR branch = llvm-6-try - env: IMAGE=dist-x86_64-linux DEPLOY=1 - if: branch = try OR branch = auto + if: branch = try OR branch = llvm-6-try # "alternate" deployments, these are "nightlies" but have LLVM assertions # turned on, they're deployed to a different location primarily for # additional testing. - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 - if: branch = try OR branch = auto + if: branch = try OR branch = llvm-6-try - env: > RUST_CHECK_TARGET=dist @@ -36,7 +36,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = llvm-6-try # macOS builders. These are placed near the beginning because they are very # slow to run. @@ -57,7 +57,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode8.3 - if: branch = auto + if: branch = llvm-6-try - env: > RUST_CHECK_TARGET=check @@ -71,7 +71,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode8.3 - if: branch = auto + if: branch = llvm-6-try # OSX builders producing releases. These do not run the full test suite and # just produce a bunch of artifacts. @@ -91,7 +91,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = llvm-6-try - env: > RUST_CHECK_TARGET=dist @@ -105,79 +105,79 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = llvm-6-try # Linux builders, remaining docker images - env: IMAGE=arm-android - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=armhf-gnu - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-various-1 DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-various-2 DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-aarch64-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-android DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-arm-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-armhf-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-armv7-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-i686-freebsd DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-i686-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-mips-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-mips64-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-mips64el-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-mipsel-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-powerpc-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-powerpc64-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-powerpc64le-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-s390x-linux DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-x86_64-freebsd DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-x86_64-musl DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=dist-x86_64-netbsd DEPLOY=1 - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=asmjs - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=i686-gnu - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=i686-gnu-nopt - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=wasm32-unknown - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-full-bootstrap - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-aux - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-tools - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-debug - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-nopt - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-distcheck - if: branch = auto + if: branch = llvm-6-try - env: IMAGE=x86_64-gnu-incremental - if: branch = auto + if: branch = llvm-6-try - stage: publish toolstate if: branch = master AND type = push diff --git a/appveyor.yml b/appveyor.yml index 7f1c538a32e..17f98cdfd93 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -181,7 +181,7 @@ on_failure: branches: only: - - auto + - llvm-6-try before_deploy: - ps: | |