Skip to content

Commit 6c26381

Browse files
committed
extract tests to env var
1 parent 766444e commit 6c26381

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,22 @@ envs:
5858
NO_DEBUG_ASSERTIONS: 1
5959
NO_OVERFLOW_CHECKS: 1
6060

61+
# Different set of tests to run tests in parallel in multiple jobs.
62+
stage_2_test_set1: &stage_2_test_set1
63+
SCRIPT: >-
64+
python3 ../x.py --stage 2 test
65+
--skip compiler
66+
--skip src
67+
68+
stage_2_test_set2: &stage_2_test_set2
69+
SCRIPT: >-
70+
python3 ../x.py --stage 2 test
71+
--skip tests
72+
--skip coverage-map
73+
--skip coverage-run
74+
--skip library
75+
--skip tidyselftest
76+
6177
production:
6278
&production
6379
DEPLOY_BUCKET: rust-lang-ci2
@@ -217,34 +233,22 @@ auto:
217233
- image: i686-gnu-1
218234
env:
219235
IMAGE: i686-gnu
220-
SCRIPT: >-
221-
python3 ../x.py --stage 2 test
222-
--skip compiler
223-
--skip src
236+
<<: *stage_2_test_set1
224237
<<: *job-linux-4c
225238

226239
# Skip tests that run in i686-gnu-1
227240
- image: i686-gnu-2
228241
env:
229242
IMAGE: i686-gnu
230-
SCRIPT: >-
231-
python3 ../x.py --stage 2 test
232-
--skip tests
233-
--skip coverage-map
234-
--skip coverage-run
235-
--skip library
236-
--skip tidyselftest
243+
<<: *stage_2_test_set2
237244
<<: *job-linux-4c
238245

239246
# The i686-gnu-nopt job is split into multiple jobs to run tests in parallel.
240247
# i686-gnu-nopt-1 skips tests that run in i686-gnu-nopt-2
241248
- image: i686-gnu-nopt-1
242249
env:
243250
IMAGE: i686-gnu-nopt
244-
SCRIPT: >-
245-
python3 ../x.py --stage 2 test
246-
--skip compiler
247-
--skip src
251+
<<: *stage_2_test_set1
248252
<<: *job-linux-4c
249253

250254
# Skip tests that run in i686-gnu-nopt-1

0 commit comments

Comments
 (0)