Skip to content

Commit 8371377

Browse files
ehussehuss
committed
CI: Set job names.
This should make it easier to identify what each job is doing when looking at the Travis or Appveyor UI. - Set `name` for each job in Travis. - Move `CI_JOB_NAME` to the front in Appveyor so that it appears first in the UI.
1 parent e1b8898 commit 8371377

File tree

2 files changed

+76
-34
lines changed

2 files changed

+76
-34
lines changed

‎.travis.yml

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,27 @@ git:
1212
depth: 2
1313
submodules: false
1414

15+
env:
16+
global:
17+
- CI_JOB_NAME=$TRAVIS_JOB_NAME
18+
1519
matrix:
1620
fast_finish: true
1721
include:
1822
# Images used in testing PR and try-build should be run first.
1923
- env: IMAGE=x86_64-gnu-llvm-6.0 RUST_BACKTRACE=1
24+
name: x86_64-gnu-llvm-6.0
2025
if: type = pull_request OR branch = auto
2126

2227
- env: IMAGE=dist-x86_64-linux DEPLOY=1
28+
name: dist-x86_64-linux
2329
if: branch = try OR branch = auto
2430

2531
# "alternate" deployments, these are "nightlies" but have LLVM assertions
2632
# turned on, they're deployed to a different location primarily for
2733
# additional testing.
28-
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt
34+
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
35+
name: dist-x86_64-linux-alt
2936
if: branch = try OR branch = auto
3037

3138
- env: >
@@ -37,9 +44,9 @@ matrix:
3744
MACOSX_DEPLOYMENT_TARGET=10.7
3845
NO_LLVM_ASSERTIONS=1
3946
NO_DEBUG_ASSERTIONS=1
40-
CI_JOB_NAME=dist-x86_64-apple-alt
4147
os: osx
4248
osx_image: xcode9.3-moar
49+
name: dist-x86_64-apple-alt
4350
if: branch = auto
4451
4552
# macOS builders. These are placed near the beginning because they are very
@@ -60,9 +67,9 @@ matrix:
6067
MACOSX_STD_DEPLOYMENT_TARGET=10.7
6168
NO_LLVM_ASSERTIONS=1
6269
NO_DEBUG_ASSERTIONS=1
63-
CI_JOB_NAME=x86_64-apple
6470
os: osx
6571
osx_image: xcode9.3-moar
72+
name: x86_64-apple
6673
if: branch = auto
6774
6875
- env: >
@@ -74,9 +81,9 @@ matrix:
7481
MACOSX_STD_DEPLOYMENT_TARGET=10.7
7582
NO_LLVM_ASSERTIONS=1
7683
NO_DEBUG_ASSERTIONS=1
77-
CI_JOB_NAME=i686-apple
7884
os: osx
7985
osx_image: xcode9.3-moar
86+
name: i686-apple
8087
if: branch = auto
8188
8289
# OSX builders producing releases. These do not run the full test suite and
@@ -95,9 +102,9 @@ matrix:
95102
NO_LLVM_ASSERTIONS=1
96103
NO_DEBUG_ASSERTIONS=1
97104
DIST_REQUIRE_ALL_TOOLS=1
98-
CI_JOB_NAME=dist-i686-apple
99105
os: osx
100106
osx_image: xcode9.3-moar
107+
name: dist-i686-apple
101108
if: branch = auto
102109
103110
- env: >
@@ -110,81 +117,116 @@ matrix:
110117
NO_LLVM_ASSERTIONS=1
111118
NO_DEBUG_ASSERTIONS=1
112119
DIST_REQUIRE_ALL_TOOLS=1
113-
CI_JOB_NAME=dist-x86_64-apple
114120
os: osx
115121
osx_image: xcode9.3-moar
122+
name: dist-x86_64-apple
116123
if: branch = auto
117124
118125
# Linux builders, remaining docker images
119126
- env: IMAGE=arm-android
127+
name: arm-android
120128
if: branch = auto
121129
- env: IMAGE=armhf-gnu
130+
name: armhf-gnu
122131
if: branch = auto
123132
- env: IMAGE=dist-various-1 DEPLOY=1
133+
name: dist-various-1
124134
if: branch = auto
125135
- env: IMAGE=dist-various-2 DEPLOY=1
136+
name: dist-various-2
126137
if: branch = auto
127138
- env: IMAGE=dist-aarch64-linux DEPLOY=1
139+
name: dist-aarch64-linux
128140
if: branch = auto
129141
- env: IMAGE=dist-android DEPLOY=1
142+
name: dist-android
130143
if: branch = auto
131144
- env: IMAGE=dist-arm-linux DEPLOY=1
145+
name: dist-arm-linux
132146
if: branch = auto
133147
- env: IMAGE=dist-armhf-linux DEPLOY=1
148+
name: dist-armhf-linux
134149
if: branch = auto
135150
- env: IMAGE=dist-armv7-linux DEPLOY=1
151+
name: dist-armv7-linux
136152
if: branch = auto
137153
- env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1
154+
name: dist-i586-gnu-i586-i686-musl
138155
if: branch = auto
139156
- env: IMAGE=dist-i686-freebsd DEPLOY=1
157+
name: dist-i686-freebsd
140158
if: branch = auto
141159
- env: IMAGE=dist-i686-linux DEPLOY=1
160+
name: dist-i686-linux
142161
if: branch = auto
143162
- env: IMAGE=dist-mips-linux DEPLOY=1
163+
name: dist-mips-linux
144164
if: branch = auto
145165
- env: IMAGE=dist-mips64-linux DEPLOY=1
166+
name: dist-mips64-linux
146167
if: branch = auto
147168
- env: IMAGE=dist-mips64el-linux DEPLOY=1
169+
name: dist-mips64el-linux
148170
if: branch = auto
149171
- env: IMAGE=dist-mipsel-linux DEPLOY=1
172+
name: dist-mipsel-linux
150173
if: branch = auto
151174
- env: IMAGE=dist-powerpc-linux DEPLOY=1
175+
name: dist-powerpc-linux
152176
if: branch = auto
153177
- env: IMAGE=dist-powerpc64-linux DEPLOY=1
178+
name: dist-powerpc64-linux
154179
if: branch = auto
155180
- env: IMAGE=dist-powerpc64le-linux DEPLOY=1
181+
name: dist-powerpc64le-linux
156182
if: branch = auto
157183
- env: IMAGE=dist-s390x-linux DEPLOY=1
184+
name: dist-s390x-linux
158185
if: branch = auto
159186
- env: IMAGE=dist-x86_64-freebsd DEPLOY=1
187+
name: dist-x86_64-freebsd
160188
if: branch = auto
161189
- env: IMAGE=dist-x86_64-musl DEPLOY=1
190+
name: dist-x86_64-musl
162191
if: branch = auto
163192
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
193+
name: dist-x86_64-netbsd
164194
if: branch = auto
165195
- env: IMAGE=asmjs
196+
name: asmjs
166197
if: branch = auto
167198
- env: IMAGE=i686-gnu
199+
name: i686-gnu
168200
if: branch = auto
169201
- env: IMAGE=i686-gnu-nopt
202+
name: i686-gnu-nopt
170203
if: branch = auto
171204
- env: IMAGE=test-various
205+
name: test-various
172206
if: branch = auto
173207
- env: IMAGE=x86_64-gnu
208+
name: x86_64-gnu
174209
if: branch = auto
175210
- env: IMAGE=x86_64-gnu-full-bootstrap
211+
name: x86_64-gnu-full-bootstrap
176212
if: branch = auto
177213
- env: IMAGE=x86_64-gnu-aux
214+
name: x86_64-gnu-aux
178215
if: branch = auto
179216
- env: IMAGE=x86_64-gnu-tools
217+
name: x86_64-gnu-tools
180218
if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
181219
- env: IMAGE=x86_64-gnu-debug
220+
name: x86_64-gnu-debug
182221
if: branch = auto
183222
- env: IMAGE=x86_64-gnu-nopt
223+
name: x86_64-gnu-nopt
184224
if: branch = auto
185225
- env: IMAGE=x86_64-gnu-distcheck
226+
name: x86_64-gnu-distcheck
186227
if: branch = auto
187228
- env: IMAGE=mingw-check
229+
name: mingw-check
188230
if: type = pull_request OR branch = auto
189231

190232
- stage: publish toolstate

‎appveyor.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@ environment:
77

88
matrix:
99
# 32/64 bit MSVC tests
10-
- MSYS_BITS: 64
10+
- CI_JOB_NAME: x86_64-msvc
11+
MSYS_BITS: 64
1112
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
1213
SCRIPT: python x.py test
13-
CI_JOB_NAME: x86_64-msvc
14-
- MSYS_BITS: 32
14+
- CI_JOB_NAME: i686-msvc-1
15+
MSYS_BITS: 32
1516
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
1617
SCRIPT: make appveyor-subset-1
17-
CI_JOB_NAME: i686-msvc-1
18-
- MSYS_BITS: 32
18+
- CI_JOB_NAME: i686-msvc-2
19+
MSYS_BITS: 32
1920
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
2021
SCRIPT: make appveyor-subset-2
21-
CI_JOB_NAME: i686-msvc-2
2222

2323
# MSVC aux tests
24-
- MSYS_BITS: 64
24+
- CI_JOB_NAME: x86_64-msvc-aux
25+
MSYS_BITS: 64
2526
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
2627
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
27-
CI_JOB_NAME: x86_64-msvc-aux
28-
- MSYS_BITS: 64
28+
- CI_JOB_NAME: x86_64-msvc-cargo
29+
MSYS_BITS: 64
2930
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
3031
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
31-
CI_JOB_NAME: x86_64-msvc-cargo
3232

3333
# MSVC tools tests
34-
- MSYS_BITS: 64
34+
- CI_JOB_NAME: x86_64-msvc-tools
35+
MSYS_BITS: 64
3536
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
3637
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
37-
CI_JOB_NAME: x86_64-msvc-tools
3838

3939
# 32/64-bit MinGW builds.
4040
#
@@ -49,73 +49,73 @@ environment:
4949
# bucket, but they cleraly didn't originate there! The downloads originally
5050
# came from the mingw-w64 SourceForge download site. Unfortunately
5151
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
52-
- MSYS_BITS: 32
52+
- CI_JOB_NAME: i686-mingw-1
53+
MSYS_BITS: 32
5354
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
5455
SCRIPT: make appveyor-subset-1
5556
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
5657
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
5758
MINGW_DIR: mingw32
58-
CI_JOB_NAME: i686-mingw-1
59-
- MSYS_BITS: 32
59+
- CI_JOB_NAME: i686-mingw-2
60+
MSYS_BITS: 32
6061
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
6162
SCRIPT: make appveyor-subset-2
6263
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
6364
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6465
MINGW_DIR: mingw32
65-
CI_JOB_NAME: i686-mingw-2
66-
- MSYS_BITS: 64
66+
- CI_JOB_NAME: x86_64-mingw
67+
MSYS_BITS: 64
6768
SCRIPT: python x.py test
6869
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
6970
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
7071
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
7172
MINGW_DIR: mingw64
72-
CI_JOB_NAME: x86_64-mingw
7373

7474
# 32/64 bit MSVC and GNU deployment
75-
- RUST_CONFIGURE_ARGS: >
75+
- CI_JOB_NAME: dist-x86_64-msvc
76+
RUST_CONFIGURE_ARGS: >
7677
--build=x86_64-pc-windows-msvc
7778
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
7879
--enable-full-tools
7980
--enable-profiler
8081
SCRIPT: python x.py dist
8182
DIST_REQUIRE_ALL_TOOLS: 1
8283
DEPLOY: 1
83-
CI_JOB_NAME: dist-x86_64-msvc
8484
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview
85-
- RUST_CONFIGURE_ARGS: >
85+
- CI_JOB_NAME: dist-i686-msvc
86+
RUST_CONFIGURE_ARGS: >
8687
--build=i686-pc-windows-msvc
8788
--target=i586-pc-windows-msvc
8889
--enable-full-tools
8990
--enable-profiler
9091
SCRIPT: python x.py dist
9192
DIST_REQUIRE_ALL_TOOLS: 1
9293
DEPLOY: 1
93-
CI_JOB_NAME: dist-i686-msvc
94-
- MSYS_BITS: 32
94+
- CI_JOB_NAME: dist-i686-mingw
95+
MSYS_BITS: 32
9596
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
9697
SCRIPT: python x.py dist
9798
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
9899
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
99100
MINGW_DIR: mingw32
100101
DIST_REQUIRE_ALL_TOOLS: 1
101102
DEPLOY: 1
102-
CI_JOB_NAME: dist-i686-mingw
103-
- MSYS_BITS: 64
103+
- CI_JOB_NAME: dist-x86_64-mingw
104+
MSYS_BITS: 64
104105
SCRIPT: python x.py dist
105106
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
106107
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
107108
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
108109
MINGW_DIR: mingw64
109110
DIST_REQUIRE_ALL_TOOLS: 1
110111
DEPLOY: 1
111-
CI_JOB_NAME: dist-x86_64-mingw
112112

113113
# "alternate" deployment, see .travis.yml for more info
114-
- MSYS_BITS: 64
114+
- CI_JOB_NAME: dist-x86_64-msvc-alt
115+
MSYS_BITS: 64
115116
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
116117
SCRIPT: python x.py dist
117118
DEPLOY_ALT: 1
118-
CI_JOB_NAME: dist-x86_64-msvc-alt
119119

120120
matrix:
121121
fast_finish: true

0 commit comments

Comments
 (0)