Skip to content

Commit 69d68f9

Browse files
borsbors
committed
Auto merge of #74620 - rust-lang:remove-most-azure, r=Mark-Simulacrum
Disable Azure Pipelines except for macOS Following up on #74565, this PR disables most of Azure Pipelines except for macOS auto builds, practically switching us to GitHub Actions 🎉 r? @Mark-Simulacrum
2 parents e22b61b + ffd1122 commit 69d68f9

File tree

4 files changed

+3
-298
lines changed

4 files changed

+3
-298
lines changed

‎src/ci/azure-pipelines/auto.yml‎

Lines changed: 1 addition & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -10,69 +10,14 @@
1010
#####################################
1111

1212
#
13-
# Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows.
13+
# Azure Pipelines "auto" branch build for Rust on macOS
1414
#
1515

1616
pr: none
1717
trigger:
1818
- auto
1919

20-
variables:
21-
- group: dummy-credentials
22-
2320
jobs:
24-
- job: Linux
25-
timeoutInMinutes: 600
26-
pool:
27-
vmImage: ubuntu-16.04
28-
steps:
29-
- template: steps/run.yml
30-
strategy:
31-
matrix:
32-
x86_64-gnu-llvm-8:
33-
RUST_BACKTRACE: 1
34-
dist-x86_64-linux: {}
35-
dist-x86_64-linux-alt:
36-
IMAGE: dist-x86_64-linux
37-
arm-android: {}
38-
armhf-gnu: {}
39-
dist-various-1: {}
40-
dist-various-2: {}
41-
dist-aarch64-linux: {}
42-
dist-android: {}
43-
dist-arm-linux: {}
44-
dist-armhf-linux: {}
45-
dist-armv7-linux: {}
46-
dist-i586-gnu-i586-i686-musl: {}
47-
dist-i686-freebsd: {}
48-
dist-i686-linux: {}
49-
dist-mips-linux: {}
50-
dist-mips64-linux: {}
51-
dist-mips64el-linux: {}
52-
dist-mipsel-linux: {}
53-
dist-powerpc-linux: {}
54-
dist-powerpc64-linux: {}
55-
dist-powerpc64le-linux: {}
56-
dist-riscv64-linux: {}
57-
dist-s390x-linux: {}
58-
dist-x86_64-freebsd: {}
59-
dist-x86_64-illumos: {}
60-
dist-x86_64-musl: {}
61-
dist-x86_64-netbsd: {}
62-
i686-gnu: {}
63-
i686-gnu-nopt: {}
64-
test-various: {}
65-
wasm32: {}
66-
x86_64-gnu: {}
67-
x86_64-gnu-full-bootstrap: {}
68-
x86_64-gnu-aux: {}
69-
x86_64-gnu-tools:
70-
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
71-
x86_64-gnu-debug: {}
72-
x86_64-gnu-nopt: {}
73-
x86_64-gnu-distcheck: {}
74-
mingw-check: {}
75-
7621
- job: macOS
7722
timeoutInMinutes: 600
7823
pool:
@@ -115,115 +60,3 @@ jobs:
11560
MACOSX_DEPLOYMENT_TARGET: 10.7
11661
NO_LLVM_ASSERTIONS: 1
11762
NO_DEBUG_ASSERTIONS: 1
118-
119-
120-
- job: Windows
121-
timeoutInMinutes: 600
122-
pool:
123-
vmImage: 'vs2017-win2016'
124-
steps:
125-
- template: steps/run.yml
126-
strategy:
127-
matrix:
128-
# 32/64 bit MSVC tests
129-
x86_64-msvc-1:
130-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
131-
SCRIPT: make ci-subset-1
132-
# FIXME(#59637)
133-
NO_DEBUG_ASSERTIONS: 1
134-
NO_LLVM_ASSERTIONS: 1
135-
x86_64-msvc-2:
136-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
137-
SCRIPT: make ci-subset-2
138-
i686-msvc-1:
139-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
140-
SCRIPT: make ci-subset-1
141-
# FIXME(#59637)
142-
NO_DEBUG_ASSERTIONS: 1
143-
NO_LLVM_ASSERTIONS: 1
144-
i686-msvc-2:
145-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
146-
SCRIPT: make ci-subset-2
147-
# FIXME(#59637)
148-
NO_DEBUG_ASSERTIONS: 1
149-
NO_LLVM_ASSERTIONS: 1
150-
x86_64-msvc-cargo:
151-
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
152-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
153-
VCVARS_BAT: vcvars64.bat
154-
# FIXME(#59637)
155-
NO_DEBUG_ASSERTIONS: 1
156-
NO_LLVM_ASSERTIONS: 1
157-
# MSVC tools tests
158-
x86_64-msvc-tools:
159-
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py
160-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
161-
162-
# 32/64-bit MinGW builds.
163-
#
164-
# We are using MinGW with posix threads since LLVM does not compile with
165-
# the win32 threads version due to missing support for C++'s std::thread.
166-
#
167-
# Instead of relying on the MinGW version installed on appveryor we download
168-
# and install one ourselves so we won't be surprised by changes to appveyor's
169-
# build image.
170-
#
171-
# Finally, note that the downloads below are all in the `rust-lang-ci` S3
172-
# bucket, but they cleraly didn't originate there! The downloads originally
173-
# came from the mingw-w64 SourceForge download site. Unfortunately
174-
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
175-
i686-mingw-1:
176-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
177-
SCRIPT: make ci-mingw-subset-1
178-
CUSTOM_MINGW: 1
179-
# FIXME(#59637)
180-
NO_DEBUG_ASSERTIONS: 1
181-
NO_LLVM_ASSERTIONS: 1
182-
i686-mingw-2:
183-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
184-
SCRIPT: make ci-mingw-subset-2
185-
CUSTOM_MINGW: 1
186-
x86_64-mingw-1:
187-
SCRIPT: make ci-mingw-subset-1
188-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
189-
CUSTOM_MINGW: 1
190-
# FIXME(#59637)
191-
NO_DEBUG_ASSERTIONS: 1
192-
NO_LLVM_ASSERTIONS: 1
193-
x86_64-mingw-2:
194-
SCRIPT: make ci-mingw-subset-2
195-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
196-
CUSTOM_MINGW: 1
197-
198-
# 32/64 bit MSVC and GNU deployment
199-
dist-x86_64-msvc:
200-
INITIAL_RUST_CONFIGURE_ARGS: >-
201-
--build=x86_64-pc-windows-msvc
202-
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
203-
--enable-full-tools
204-
--enable-profiler
205-
SCRIPT: python x.py dist
206-
DIST_REQUIRE_ALL_TOOLS: 1
207-
dist-i686-msvc:
208-
INITIAL_RUST_CONFIGURE_ARGS: >-
209-
--build=i686-pc-windows-msvc
210-
--target=i586-pc-windows-msvc
211-
--enable-full-tools
212-
--enable-profiler
213-
SCRIPT: python x.py dist
214-
DIST_REQUIRE_ALL_TOOLS: 1
215-
dist-i686-mingw:
216-
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
217-
SCRIPT: python x.py dist
218-
CUSTOM_MINGW: 1
219-
DIST_REQUIRE_ALL_TOOLS: 1
220-
dist-x86_64-mingw:
221-
SCRIPT: python x.py dist
222-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
223-
CUSTOM_MINGW: 1
224-
DIST_REQUIRE_ALL_TOOLS: 1
225-
226-
# "alternate" deployment, see .travis.yml for more info
227-
dist-x86_64-msvc-alt:
228-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
229-
SCRIPT: python x.py dist

‎src/ci/azure-pipelines/master.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/ci/azure-pipelines/pr.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/ci/azure-pipelines/try.yml‎

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,70 +13,10 @@ pr: none
1313
trigger:
1414
- try
1515

16-
variables:
17-
- group: dummy-credentials
18-
1916
jobs:
20-
- job: Linux
17+
- job: Dummy
2118
timeoutInMinutes: 600
2219
pool:
2320
vmImage: ubuntu-16.04
2421
steps:
25-
- template: steps/run.yml
26-
strategy:
27-
matrix:
28-
dist-x86_64-linux: {}
29-
30-
# The macOS and Windows builds here are currently disabled due to them not being
31-
# overly necessary on `try` builds. We also don't actually have anything that
32-
# consumes the artifacts currently. Perhaps one day we can re-enable, but for now
33-
# it helps free up capacity on Azure.
34-
# - job: macOS
35-
# timeoutInMinutes: 600
36-
# pool:
37-
# vmImage: macos-10.15
38-
# steps:
39-
# - template: steps/run.yml
40-
# strategy:
41-
# matrix:
42-
# dist-x86_64-apple:
43-
# SCRIPT: ./x.py dist
44-
# INITIAL_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 --set rust.jemalloc
45-
# DEPLOY: 1
46-
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
47-
# MACOSX_DEPLOYMENT_TARGET: 10.7
48-
# NO_LLVM_ASSERTIONS: 1
49-
# NO_DEBUG_ASSERTIONS: 1
50-
# DIST_REQUIRE_ALL_TOOLS: 1
51-
#
52-
# dist-x86_64-apple-alt:
53-
# SCRIPT: ./x.py dist
54-
# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
55-
# DEPLOY_ALT: 1
56-
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
57-
# MACOSX_DEPLOYMENT_TARGET: 10.7
58-
# NO_LLVM_ASSERTIONS: 1
59-
# NO_DEBUG_ASSERTIONS: 1
60-
#
61-
# - job: Windows
62-
# timeoutInMinutes: 600
63-
# pool:
64-
# vmImage: 'vs2017-win2016'
65-
# steps:
66-
# - template: steps/run.yml
67-
# strategy:
68-
# matrix:
69-
# dist-x86_64-msvc:
70-
# INITIAL_RUST_CONFIGURE_ARGS: >
71-
# --build=x86_64-pc-windows-msvc
72-
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
73-
# --enable-full-tools
74-
# --enable-profiler
75-
# SCRIPT: python x.py dist
76-
# DIST_REQUIRE_ALL_TOOLS: 1
77-
# DEPLOY: 1
78-
#
79-
# dist-x86_64-msvc-alt:
80-
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
81-
# SCRIPT: python x.py dist
82-
# DEPLOY_ALT: 1
22+
- bash: echo "We're running this job since bors is still gating on Azure"

0 commit comments

Comments
 (0)