Skip to content

Commit ee12992

Browse files
pietroalbinipietroalbini
committed
ci: guess some environment variables based on builder name and os
Some environment variables (like DEPLOY or DEPLOY_ALT for dist builders, or IMAGE on Linux builders) are set on a lot of builders, and whether they should be present or not can be detected automatically based on the builder name and the platform. This commit simplifies the CI configuration by automatically setting those environment variables.
1 parent 262ce31 commit ee12992

File tree

5 files changed

+72
-143
lines changed

5 files changed

+72
-143
lines changed

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

Lines changed: 35 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -19,136 +19,46 @@ jobs:
1919
strategy:
2020
matrix:
2121
x86_64-gnu-llvm-6.0:
22-
IMAGE: x86_64-gnu-llvm-6.0
2322
RUST_BACKTRACE: 1
24-
25-
dist-x86_64-linux:
26-
IMAGE: dist-x86_64-linux
27-
DEPLOY: 1
28-
29-
# "alternate" deployments, these are "nightlies" but have LLVM assertions
30-
# turned on, they're deployed to a different location primarily for
31-
# additional testing.
23+
dist-x86_64-linux: {}
3224
dist-x86_64-linux-alt:
3325
IMAGE: dist-x86_64-linux
34-
DEPLOY_ALT: 1
35-
36-
# Linux builders, remaining docker images
37-
arm-android:
38-
IMAGE: arm-android
39-
40-
armhf-gnu:
41-
IMAGE: armhf-gnu
42-
43-
dist-various-1:
44-
IMAGE: dist-various-1
45-
DEPLOY: 1
46-
47-
dist-various-2:
48-
IMAGE: dist-various-2
49-
DEPLOY: 1
50-
51-
dist-aarch64-linux:
52-
IMAGE: dist-aarch64-linux
53-
DEPLOY: 1
54-
55-
dist-android:
56-
IMAGE: dist-android
57-
DEPLOY: 1
58-
59-
dist-arm-linux:
60-
IMAGE: dist-arm-linux
61-
DEPLOY: 1
62-
63-
dist-armhf-linux:
64-
IMAGE: dist-armhf-linux
65-
DEPLOY: 1
66-
67-
dist-armv7-linux:
68-
IMAGE: dist-armv7-linux
69-
DEPLOY: 1
70-
71-
dist-i586-gnu-i586-i686-musl:
72-
IMAGE: dist-i586-gnu-i586-i686-musl
73-
DEPLOY: 1
74-
75-
dist-i686-freebsd:
76-
IMAGE: dist-i686-freebsd
77-
DEPLOY: 1
78-
79-
dist-i686-linux:
80-
IMAGE: dist-i686-linux
81-
DEPLOY: 1
82-
83-
dist-mips-linux:
84-
IMAGE: dist-mips-linux
85-
DEPLOY: 1
86-
87-
dist-mips64-linux:
88-
IMAGE: dist-mips64-linux
89-
DEPLOY: 1
90-
91-
dist-mips64el-linux:
92-
IMAGE: dist-mips64el-linux
93-
DEPLOY: 1
94-
95-
dist-mipsel-linux:
96-
IMAGE: dist-mipsel-linux
97-
DEPLOY: 1
98-
99-
dist-powerpc-linux:
100-
IMAGE: dist-powerpc-linux
101-
DEPLOY: 1
102-
103-
dist-powerpc64-linux:
104-
IMAGE: dist-powerpc64-linux
105-
DEPLOY: 1
106-
107-
dist-powerpc64le-linux:
108-
IMAGE: dist-powerpc64le-linux
109-
DEPLOY: 1
110-
111-
dist-s390x-linux:
112-
IMAGE: dist-s390x-linux
113-
DEPLOY: 1
114-
115-
dist-x86_64-freebsd:
116-
IMAGE: dist-x86_64-freebsd
117-
DEPLOY: 1
118-
119-
dist-x86_64-musl:
120-
IMAGE: dist-x86_64-musl
121-
DEPLOY: 1
122-
123-
dist-x86_64-netbsd:
124-
IMAGE: dist-x86_64-netbsd
125-
DEPLOY: 1
126-
127-
i686-gnu:
128-
IMAGE: i686-gnu
129-
i686-gnu-nopt:
130-
IMAGE: i686-gnu-nopt
131-
test-various:
132-
IMAGE: test-various
133-
wasm32:
134-
IMAGE: wasm32
135-
x86_64-gnu:
136-
IMAGE: x86_64-gnu
137-
x86_64-gnu-full-bootstrap:
138-
IMAGE: x86_64-gnu-full-bootstrap
139-
x86_64-gnu-aux:
140-
IMAGE: x86_64-gnu-aux
26+
arm-android: {}
27+
armhf-gnu: {}
28+
dist-various-1: {}
29+
dist-various-2: {}
30+
dist-aarch64-linux: {}
31+
dist-android: {}
32+
dist-arm-linux: {}
33+
dist-armhf-linux: {}
34+
dist-armv7-linux: {}
35+
dist-i586-gnu-i586-i686-musl: {}
36+
dist-i686-freebsd: {}
37+
dist-i686-linux: {}
38+
dist-mips-linux: {}
39+
dist-mips64-linux: {}
40+
dist-mips64el-linux: {}
41+
dist-mipsel-linux: {}
42+
dist-powerpc-linux: {}
43+
dist-powerpc64-linux: {}
44+
dist-powerpc64le-linux: {}
45+
dist-s390x-linux: {}
46+
dist-x86_64-freebsd: {}
47+
dist-x86_64-musl: {}
48+
dist-x86_64-netbsd: {}
49+
i686-gnu: {}
50+
i686-gnu-nopt: {}
51+
test-various: {}
52+
wasm32: {}
53+
x86_64-gnu: {}
54+
x86_64-gnu-full-bootstrap: {}
55+
x86_64-gnu-aux: {}
14156
x86_64-gnu-tools:
142-
IMAGE: x86_64-gnu-tools
14357
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
144-
x86_64-gnu-debug:
145-
IMAGE: x86_64-gnu-debug
146-
x86_64-gnu-nopt:
147-
IMAGE: x86_64-gnu-nopt
148-
x86_64-gnu-distcheck:
149-
IMAGE: x86_64-gnu-distcheck
150-
mingw-check:
151-
IMAGE: mingw-check
58+
x86_64-gnu-debug: {}
59+
x86_64-gnu-nopt: {}
60+
x86_64-gnu-distcheck: {}
61+
mingw-check: {}
15262

15363
- job: macOS
15464
timeoutInMinutes: 600
@@ -176,7 +86,6 @@ jobs:
17686
dist-x86_64-apple:
17787
SCRIPT: ./x.py dist
17888
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
179-
DEPLOY: 1
18089
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
18190
MACOSX_DEPLOYMENT_TARGET: 10.7
18291
NO_LLVM_ASSERTIONS: 1
@@ -186,7 +95,6 @@ jobs:
18695
dist-x86_64-apple-alt:
18796
SCRIPT: ./x.py dist
18897
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
189-
DEPLOY_ALT: 1
19098
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
19199
MACOSX_DEPLOYMENT_TARGET: 10.7
192100
NO_LLVM_ASSERTIONS: 1
@@ -204,7 +112,6 @@ jobs:
204112
dist-i686-apple:
205113
SCRIPT: ./x.py dist
206114
RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --set rust.jemalloc
207-
DEPLOY: 1
208115
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
209116
MACOSX_DEPLOYMENT_TARGET: 10.7
210117
NO_LLVM_ASSERTIONS: 1
@@ -304,7 +211,6 @@ jobs:
304211
--enable-profiler
305212
SCRIPT: python x.py dist
306213
DIST_REQUIRE_ALL_TOOLS: 1
307-
DEPLOY: 1
308214
dist-i686-msvc:
309215
RUST_CONFIGURE_ARGS: >-
310216
--build=i686-pc-windows-msvc
@@ -313,22 +219,18 @@ jobs:
313219
--enable-profiler
314220
SCRIPT: python x.py dist
315221
DIST_REQUIRE_ALL_TOOLS: 1
316-
DEPLOY: 1
317222
dist-i686-mingw:
318223
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
319224
SCRIPT: python x.py dist
320225
CUSTOM_MINGW: 1
321226
DIST_REQUIRE_ALL_TOOLS: 1
322-
DEPLOY: 1
323227
dist-x86_64-mingw:
324228
SCRIPT: python x.py dist
325229
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
326230
CUSTOM_MINGW: 1
327231
DIST_REQUIRE_ALL_TOOLS: 1
328-
DEPLOY: 1
329232

330233
# "alternate" deployment, see .travis.yml for more info
331234
dist-x86_64-msvc-alt:
332235
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
333236
SCRIPT: python x.py dist
334-
DEPLOY_ALT: 1

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ jobs:
1818
- template: steps/run.yml
1919
strategy:
2020
matrix:
21-
x86_64-gnu-llvm-6.0:
22-
IMAGE: x86_64-gnu-llvm-6.0
23-
mingw-check:
24-
IMAGE: mingw-check
21+
x86_64-gnu-llvm-6.0: {}
22+
mingw-check: {}
2523
x86_64-gnu-tools:
26-
IMAGE: x86_64-gnu-tools
2724
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1

‎src/ci/azure-pipelines/steps/run.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ steps:
2828
- checkout: self
2929
fetchDepth: 2
3030

31+
- bash: src/ci/scripts/setup-environment.sh
32+
displayName: Setup environment
33+
3134
- bash: src/ci/scripts/should-skip-this.sh
3235
displayName: Decide whether to run this job
3336

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@ jobs:
1414
- template: steps/run.yml
1515
strategy:
1616
matrix:
17-
dist-x86_64-linux:
18-
IMAGE: dist-x86_64-linux
19-
DEPLOY: 1
20-
17+
dist-x86_64-linux: {}
2118
dist-x86_64-linux-alt:
2219
IMAGE: dist-x86_64-linux
23-
DEPLOY_ALT: 1
2420

2521
# The macOS and Windows builds here are currently disabled due to them not being
2622
# overly necessary on `try` builds. We also don't actually have anything that

‎src/ci/scripts/setup-environment.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
# This script guesses some environment variables based on the builder name and
3+
# the current platform, to reduce the amount of variables defined in the CI
4+
# configuration.
5+
6+
set -euo pipefail
7+
IFS=$'\n\t'
8+
9+
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
10+
11+
# Builders starting with `dist-` are dist builders, but if they also end with
12+
# `-alt` they are alternate dist builders.
13+
if [[ "${CI_JOB_NAME}" = dist-* ]]; then
14+
if [[ "${CI_JOB_NAME}" = *-alt ]]; then
15+
echo "alternate dist builder detected, setting DEPLOY_ALT=1"
16+
ciCommandSetEnv DEPLOY_ALT 1
17+
else
18+
echo "normal dist builder detected, setting DEPLOY=1"
19+
ciCommandSetEnv DEPLOY 1
20+
fi
21+
fi
22+
23+
# All the Linux builds happen inside Docker.
24+
if isLinux; then
25+
if [[ -z "${IMAGE+x}" ]]; then
26+
echo "linux builder detected, using docker to run the build"
27+
ciCommandSetEnv IMAGE "${CI_JOB_NAME}"
28+
else
29+
echo "a custom docker image is already set"
30+
fi
31+
fi

0 commit comments

Comments
 (0)