Skip to content

Commit b5e6210

Browse files
onur-ozkanonur-ozkan
committed
set change-id as default in CI workflows
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 43a2c9a commit b5e6210

File tree

2 files changed

+39
-25
lines changed

2 files changed

+39
-25
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ defaults:
3434
concurrency:
3535
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3636
cancel-in-progress: true
37+
env:
38+
RUST_CONFIGURE_ARGS: "--set change-id=99999999"
3739
jobs:
3840
pr:
3941
name: "PR - ${{ matrix.name }}"
@@ -316,7 +318,7 @@ jobs:
316318
- name: dist-x86_64-apple
317319
env:
318320
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
319-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
321+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
320322
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
321323
MACOSX_DEPLOYMENT_TARGET: 10.12
322324
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -329,7 +331,7 @@ jobs:
329331
- name: dist-apple-various
330332
env:
331333
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
332-
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
334+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
333335
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
334336
MACOSX_DEPLOYMENT_TARGET: 10.12
335337
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -340,7 +342,7 @@ jobs:
340342
- name: x86_64-apple-1
341343
env:
342344
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
343-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
345+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
344346
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
345347
MACOSX_DEPLOYMENT_TARGET: 10.12
346348
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -351,7 +353,7 @@ jobs:
351353
- name: x86_64-apple-2
352354
env:
353355
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
354-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
356+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
355357
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
356358
MACOSX_DEPLOYMENT_TARGET: 10.12
357359
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -362,7 +364,7 @@ jobs:
362364
- name: dist-aarch64-apple
363365
env:
364366
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
365-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
367+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
366368
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
367369
SELECT_XCODE: /Applications/Xcode_13.4.1.app
368370
USE_XCODE_CLANG: 1
@@ -376,7 +378,7 @@ jobs:
376378
- name: aarch64-apple
377379
env:
378380
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
379-
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
381+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
380382
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
381383
SELECT_XCODE: /Applications/Xcode_13.4.1.app
382384
USE_XCODE_CLANG: 1
@@ -388,56 +390,56 @@ jobs:
388390
os: macos-13-xlarge
389391
- name: x86_64-msvc
390392
env:
391-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
393+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-profiler"
392394
SCRIPT: make ci-msvc
393395
os: windows-2019-8core-32gb
394396
- name: i686-msvc
395397
env:
396-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
398+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-msvc"
397399
SCRIPT: make ci-msvc
398400
os: windows-2019-8core-32gb
399401
- name: x86_64-msvc-ext
400402
env:
401403
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
402404
HOST_TARGET: x86_64-pc-windows-msvc
403-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
405+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
404406
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
405407
os: windows-2019-8core-32gb
406408
- name: i686-mingw
407409
env:
408-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
410+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-gnu"
409411
SCRIPT: make ci-mingw
410412
NO_DOWNLOAD_CI_LLVM: 1
411413
CUSTOM_MINGW: 1
412414
os: windows-2019-8core-32gb
413415
- name: x86_64-mingw
414416
env:
415417
SCRIPT: make ci-mingw
416-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
418+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-gnu --enable-profiler"
417419
NO_DOWNLOAD_CI_LLVM: 1
418420
CUSTOM_MINGW: 1
419421
os: windows-2019-8core-32gb
420422
- name: dist-x86_64-msvc
421423
env:
422-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
424+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
423425
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
424426
DIST_REQUIRE_ALL_TOOLS: 1
425427
os: windows-2019-8core-32gb
426428
- name: dist-i686-msvc
427429
env:
428-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
430+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
429431
SCRIPT: python x.py dist bootstrap --include-default-paths
430432
DIST_REQUIRE_ALL_TOOLS: 1
431433
os: windows-2019-8core-32gb
432434
- name: dist-aarch64-msvc
433435
env:
434-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
436+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
435437
SCRIPT: python x.py dist bootstrap --include-default-paths
436438
DIST_REQUIRE_ALL_TOOLS: 1
437439
os: windows-2019-8core-32gb
438440
- name: dist-i686-mingw
439441
env:
440-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
442+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
441443
NO_DOWNLOAD_CI_LLVM: 1
442444
SCRIPT: python x.py dist bootstrap --include-default-paths
443445
CUSTOM_MINGW: 1
@@ -446,14 +448,14 @@ jobs:
446448
- name: dist-x86_64-mingw
447449
env:
448450
SCRIPT: python x.py dist bootstrap --include-default-paths
449-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
451+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
450452
NO_DOWNLOAD_CI_LLVM: 1
451453
CUSTOM_MINGW: 1
452454
DIST_REQUIRE_ALL_TOOLS: 1
453455
os: windows-2019-8core-32gb
454456
- name: dist-x86_64-msvc-alt
455457
env:
456-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
458+
RUST_CONFIGURE_ARGS: "${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
457459
SCRIPT: python x.py dist bootstrap --include-default-paths
458460
os: windows-2019-8core-32gb
459461
timeout-minutes: 600

‎src/ci/github-actions/ci.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ concurrency:
316316
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
317317
cancel-in-progress: true
318318

319+
env:
320+
# Shared defaults for all jobs
321+
RUST_CONFIGURE_ARGS: "--set change-id=99999999"
322+
319323
jobs:
320324
pr:
321325
<<: *base-ci-job
@@ -509,7 +513,7 @@ jobs:
509513
- name: dist-x86_64-apple
510514
env:
511515
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
512-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin
516+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin
513517
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
514518
MACOSX_DEPLOYMENT_TARGET: 10.12
515519
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -523,7 +527,7 @@ jobs:
523527
- name: dist-apple-various
524528
env:
525529
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
526-
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
530+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
527531
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
528532
MACOSX_DEPLOYMENT_TARGET: 10.12
529533
SELECT_XCODE: /Applications/Xcode_13.4.1.app
@@ -535,7 +539,7 @@ jobs:
535539
- name: x86_64-apple-1
536540
env: &env-x86_64-apple-tests
537541
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
538-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
542+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
539543
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
540544
MACOSX_DEPLOYMENT_TARGET: 10.12
541545
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -555,6 +559,7 @@ jobs:
555559
env:
556560
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
557561
RUST_CONFIGURE_ARGS: >-
562+
${RUST_CONFIGURE_ARGS}
558563
--enable-full-tools
559564
--enable-sanitizers
560565
--enable-profiler
@@ -577,6 +582,7 @@ jobs:
577582
env:
578583
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
579584
RUST_CONFIGURE_ARGS: >-
585+
${RUST_CONFIGURE_ARGS}
580586
--enable-sanitizers
581587
--enable-profiler
582588
--set rust.jemalloc
@@ -597,21 +603,21 @@ jobs:
597603

598604
- name: x86_64-msvc
599605
env:
600-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
606+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-profiler
601607
SCRIPT: make ci-msvc
602608
<<: *job-windows-8c
603609

604610
- name: i686-msvc
605611
env:
606-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
612+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-msvc
607613
SCRIPT: make ci-msvc
608614
<<: *job-windows-8c
609615

610616
- name: x86_64-msvc-ext
611617
env:
612618
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
613619
HOST_TARGET: x86_64-pc-windows-msvc
614-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
620+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
615621
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
616622
<<: *job-windows-8c
617623

@@ -633,7 +639,7 @@ jobs:
633639

634640
- name: i686-mingw
635641
env:
636-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
642+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=i686-pc-windows-gnu
637643
SCRIPT: make ci-mingw
638644
# We are intentionally allowing an old toolchain on this builder (and that's
639645
# incompatible with LLVM downloads today).
@@ -645,6 +651,7 @@ jobs:
645651
env:
646652
SCRIPT: make ci-mingw
647653
RUST_CONFIGURE_ARGS: >-
654+
${RUST_CONFIGURE_ARGS}
648655
--build=x86_64-pc-windows-gnu
649656
--enable-profiler
650657
# We are intentionally allowing an old toolchain on this builder (and that's
@@ -656,6 +663,7 @@ jobs:
656663
- name: dist-x86_64-msvc
657664
env:
658665
RUST_CONFIGURE_ARGS: >-
666+
${RUST_CONFIGURE_ARGS}
659667
--build=x86_64-pc-windows-msvc
660668
--host=x86_64-pc-windows-msvc
661669
--target=x86_64-pc-windows-msvc
@@ -668,6 +676,7 @@ jobs:
668676
- name: dist-i686-msvc
669677
env:
670678
RUST_CONFIGURE_ARGS: >-
679+
${RUST_CONFIGURE_ARGS}
671680
--build=i686-pc-windows-msvc
672681
--host=i686-pc-windows-msvc
673682
--target=i686-pc-windows-msvc,i586-pc-windows-msvc
@@ -680,6 +689,7 @@ jobs:
680689
- name: dist-aarch64-msvc
681690
env:
682691
RUST_CONFIGURE_ARGS: >-
692+
${RUST_CONFIGURE_ARGS}
683693
--build=x86_64-pc-windows-msvc
684694
--host=aarch64-pc-windows-msvc
685695
--enable-full-tools
@@ -691,6 +701,7 @@ jobs:
691701
- name: dist-i686-mingw
692702
env:
693703
RUST_CONFIGURE_ARGS: >-
704+
${RUST_CONFIGURE_ARGS}
694705
--build=i686-pc-windows-gnu
695706
--enable-full-tools
696707
--enable-profiler
@@ -706,6 +717,7 @@ jobs:
706717
env:
707718
SCRIPT: python x.py dist bootstrap --include-default-paths
708719
RUST_CONFIGURE_ARGS: >-
720+
${RUST_CONFIGURE_ARGS}
709721
--build=x86_64-pc-windows-gnu
710722
--enable-full-tools
711723
--enable-profiler
@@ -718,7 +730,7 @@ jobs:
718730

719731
- name: dist-x86_64-msvc-alt
720732
env:
721-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
733+
RUST_CONFIGURE_ARGS: ${RUST_CONFIGURE_ARGS} --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
722734
SCRIPT: python x.py dist bootstrap --include-default-paths
723735
<<: *job-windows-8c
724736

0 commit comments

Comments
 (0)