Skip to content

Commit 3849a5f

Browse files
committed
Auto merge of #62179 - alexcrichton:less-travis-appveyor, r=pietroalbini
ci: Move most builders to Azure Pipelines This commit disables all builders on Travis and almost all builders on AppVeyor now that they're all running on Azure Pipelines. There is one remaining builder on AppVeyor which hasn't been migrated yet due to a test failure on Azure, which we'll be debugging soon. One remaining builder is left on Travis which is the tools builder whenever a submodule is changed, but we'll probably turn that off soon since it's just for PRs. The other major change in this PR is that the auto builders on Azure are now configured with "real" prod credentials which should cause them to publish all artifacts into the official CI buckets.
2 parents 8ebd67e + 6f838b4 commit 3849a5f

File tree

3 files changed

+4
-370
lines changed

3 files changed

+4
-370
lines changed

.azure-pipelines/auto.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trigger:
77
- auto
88

99
variables:
10-
- group: prod-credentials
10+
- group: real-prod-credentials
1111

1212
jobs:
1313
- job: Linux
@@ -138,8 +138,9 @@ jobs:
138138
IMAGE: x86_64-gnu-full-bootstrap
139139
x86_64-gnu-aux:
140140
IMAGE: x86_64-gnu-aux
141-
x86_64-gnu-tools:
142-
IMAGE: x86_64-gnu-tools
141+
# FIXME: needs reenabling here rather than Travis
142+
# x86_64-gnu-tools:
143+
# IMAGE: x86_64-gnu-tools
143144
x86_64-gnu-debug:
144145
IMAGE: x86_64-gnu-debug
145146
x86_64-gnu-nopt:

.travis.yml

-206
Original file line numberDiff line numberDiff line change
@@ -19,215 +19,9 @@ env:
1919
matrix:
2020
fast_finish: true
2121
include:
22-
# Images used in testing PR and try-build should be run first.
23-
- env: IMAGE=x86_64-gnu-llvm-6.0 RUST_BACKTRACE=1
24-
name: x86_64-gnu-llvm-6.0
25-
if: branch = auto
26-
27-
- env: IMAGE=dist-x86_64-linux DEPLOY=1
28-
name: dist-x86_64-linux
29-
if: branch = auto
30-
31-
# "alternate" deployments, these are "nightlies" but have LLVM assertions
32-
# turned on, they're deployed to a different location primarily for
33-
# additional testing.
34-
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
35-
name: dist-x86_64-linux-alt
36-
if: branch = auto
37-
38-
- env: >
39-
SCRIPT="./x.py dist"
40-
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb --set rust.jemalloc"
41-
SRC=.
42-
DEPLOY_ALT=1
43-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
44-
MACOSX_DEPLOYMENT_TARGET=10.7
45-
NO_LLVM_ASSERTIONS=1
46-
NO_DEBUG_ASSERTIONS=1
47-
os: osx
48-
osx_image: xcode9.3-moar
49-
name: dist-x86_64-apple-alt
50-
if: branch = auto
51-
52-
# macOS builders. These are placed near the beginning because they are very
53-
# slow to run.
54-
55-
# OSX builders running tests, these run the full test suite.
56-
# NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some
57-
# runners that run `//ignore-debug` tests.
58-
#
59-
# Note that the compiler is compiled to target 10.8 here because the Xcode
60-
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
61-
- env: >
62-
SCRIPT="./x.py test"
63-
RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
64-
SRC=.
65-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
66-
MACOSX_DEPLOYMENT_TARGET=10.8
67-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
68-
NO_LLVM_ASSERTIONS=1
69-
NO_DEBUG_ASSERTIONS=1
70-
os: osx
71-
osx_image: xcode9.3-moar
72-
name: x86_64-apple
73-
if: branch = auto
74-
75-
- env: >
76-
SCRIPT="./x.py test"
77-
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --set rust.jemalloc"
78-
SRC=.
79-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
80-
MACOSX_DEPLOYMENT_TARGET=10.8
81-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
82-
NO_LLVM_ASSERTIONS=1
83-
NO_DEBUG_ASSERTIONS=1
84-
os: osx
85-
osx_image: xcode9.3-moar
86-
name: i686-apple
87-
if: branch = auto
88-
89-
# OSX builders producing releases. These do not run the full test suite and
90-
# just produce a bunch of artifacts.
91-
#
92-
# Note that these are running in the `xcode7` image instead of the
93-
# `xcode8.2` image as above. That's because we want to build releases for
94-
# OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
95-
- env: >
96-
SCRIPT="./x.py dist"
97-
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc"
98-
SRC=.
99-
DEPLOY=1
100-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
101-
MACOSX_DEPLOYMENT_TARGET=10.7
102-
NO_LLVM_ASSERTIONS=1
103-
NO_DEBUG_ASSERTIONS=1
104-
DIST_REQUIRE_ALL_TOOLS=1
105-
os: osx
106-
osx_image: xcode9.3-moar
107-
name: dist-i686-apple
108-
if: branch = auto
109-
110-
- env: >
111-
SCRIPT="./x.py dist"
112-
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc"
113-
SRC=.
114-
DEPLOY=1
115-
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
116-
MACOSX_DEPLOYMENT_TARGET=10.7
117-
NO_LLVM_ASSERTIONS=1
118-
NO_DEBUG_ASSERTIONS=1
119-
DIST_REQUIRE_ALL_TOOLS=1
120-
os: osx
121-
osx_image: xcode9.3-moar
122-
name: dist-x86_64-apple
123-
if: branch = auto
124-
125-
# Linux builders, remaining docker images
126-
- env: IMAGE=arm-android
127-
name: arm-android
128-
if: branch = auto
129-
- env: IMAGE=armhf-gnu
130-
name: armhf-gnu
131-
if: branch = auto
132-
- env: IMAGE=dist-various-1 DEPLOY=1
133-
name: dist-various-1
134-
if: branch = auto
135-
- env: IMAGE=dist-various-2 DEPLOY=1
136-
name: dist-various-2
137-
if: branch = auto
138-
- env: IMAGE=dist-aarch64-linux DEPLOY=1
139-
name: dist-aarch64-linux
140-
if: branch = auto
141-
- env: IMAGE=dist-android DEPLOY=1
142-
name: dist-android
143-
if: branch = auto
144-
- env: IMAGE=dist-arm-linux DEPLOY=1
145-
name: dist-arm-linux
146-
if: branch = auto
147-
- env: IMAGE=dist-armhf-linux DEPLOY=1
148-
name: dist-armhf-linux
149-
if: branch = auto
150-
- env: IMAGE=dist-armv7-linux DEPLOY=1
151-
name: dist-armv7-linux
152-
if: branch = auto
153-
- env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1
154-
name: dist-i586-gnu-i586-i686-musl
155-
if: branch = auto
156-
- env: IMAGE=dist-i686-freebsd DEPLOY=1
157-
name: dist-i686-freebsd
158-
if: branch = auto
159-
- env: IMAGE=dist-i686-linux DEPLOY=1
160-
name: dist-i686-linux
161-
if: branch = auto
162-
- env: IMAGE=dist-mips-linux DEPLOY=1
163-
name: dist-mips-linux
164-
if: branch = auto
165-
- env: IMAGE=dist-mips64-linux DEPLOY=1
166-
name: dist-mips64-linux
167-
if: branch = auto
168-
- env: IMAGE=dist-mips64el-linux DEPLOY=1
169-
name: dist-mips64el-linux
170-
if: branch = auto
171-
- env: IMAGE=dist-mipsel-linux DEPLOY=1
172-
name: dist-mipsel-linux
173-
if: branch = auto
174-
- env: IMAGE=dist-powerpc-linux DEPLOY=1
175-
name: dist-powerpc-linux
176-
if: branch = auto
177-
- env: IMAGE=dist-powerpc64-linux DEPLOY=1
178-
name: dist-powerpc64-linux
179-
if: branch = auto
180-
- env: IMAGE=dist-powerpc64le-linux DEPLOY=1
181-
name: dist-powerpc64le-linux
182-
if: branch = auto
183-
- env: IMAGE=dist-s390x-linux DEPLOY=1
184-
name: dist-s390x-linux
185-
if: branch = auto
186-
- env: IMAGE=dist-x86_64-freebsd DEPLOY=1
187-
name: dist-x86_64-freebsd
188-
if: branch = auto
189-
- env: IMAGE=dist-x86_64-musl DEPLOY=1
190-
name: dist-x86_64-musl
191-
if: branch = auto
192-
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
193-
name: dist-x86_64-netbsd
194-
if: branch = auto
195-
- env: IMAGE=asmjs
196-
name: asmjs
197-
if: branch = auto
198-
- env: IMAGE=i686-gnu
199-
name: i686-gnu
200-
if: branch = auto
201-
- env: IMAGE=i686-gnu-nopt
202-
name: i686-gnu-nopt
203-
if: branch = auto
204-
- env: IMAGE=test-various
205-
name: test-various
206-
if: branch = auto
207-
- env: IMAGE=x86_64-gnu
208-
name: x86_64-gnu
209-
if: branch = auto
210-
- env: IMAGE=x86_64-gnu-full-bootstrap
211-
name: x86_64-gnu-full-bootstrap
212-
if: branch = auto
213-
- env: IMAGE=x86_64-gnu-aux
214-
name: x86_64-gnu-aux
215-
if: branch = auto
21622
- env: IMAGE=x86_64-gnu-tools
21723
name: x86_64-gnu-tools
21824
if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
219-
- env: IMAGE=x86_64-gnu-debug
220-
name: x86_64-gnu-debug
221-
if: branch = auto
222-
- env: IMAGE=x86_64-gnu-nopt
223-
name: x86_64-gnu-nopt
224-
if: branch = auto
225-
- env: IMAGE=x86_64-gnu-distcheck
226-
name: x86_64-gnu-distcheck
227-
if: branch = auto
228-
- env: IMAGE=mingw-check
229-
name: mingw-check
230-
if: branch = auto
23125

23226
before_install:
23327
# We'll use the AWS cli to download/upload cached docker layers as well as

0 commit comments

Comments
 (0)