diff options
| author | bors <bors@rust-lang.org> | 2025-05-28 01:20:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-28 01:20:50 +0000 |
| commit | 04a67d5a0587ed98632f82c404ae20f9f0a51a1d (patch) | |
| tree | 72cfb34a489ad30cf88f3e850d6098d4bc629dd1 /src/ci/github-actions | |
| parent | be422939446d7c5b27ba98debb6b4b8d6a261f1a (diff) | |
| parent | da61494400b7a0fc0613d7424983a7d3c19c1afe (diff) | |
| download | rust-04a67d5a0587ed98632f82c404ae20f9f0a51a1d.tar.gz rust-04a67d5a0587ed98632f82c404ae20f9f0a51a1d.zip | |
Auto merge of #141668 - tgross35:rollup-03gg6lf, r=tgross35
Rollup of 8 pull requests Successful merges: - rust-lang/rust#140367 (add `asm_cfg`: `#[cfg(...)]` within `asm!`) - rust-lang/rust#140894 (Make check-cfg diagnostics work in `#[doc(cfg(..))]`) - rust-lang/rust#141252 (gvn: bail out unavoidable non-ssa locals in repeat) - rust-lang/rust#141517 (rustdoc: use descriptive tooltip if doctest is conditionally ignored) - rust-lang/rust#141551 (Make two transmute-related MIR lints into HIR lint) - rust-lang/rust#141591 (ci: fix llvm test coverage) - rust-lang/rust#141647 (Bump master `stage0` compiler) - rust-lang/rust#141659 (Add `Result::map_or_default` and `Option::map_or_default`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 1d175bd97e6..e257f231184 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -332,7 +332,7 @@ auto: env: RUST_BACKTRACE: 1 IMAGE: x86_64-gnu-llvm-20 - DOCKER_SCRIPT: stage_2_test_set1.sh + DOCKER_SCRIPT: stage_2_test_set2.sh <<: *job-linux-4c # Skip tests that run in x86_64-gnu-llvm-20-{1,3} @@ -357,7 +357,7 @@ auto: env: RUST_BACKTRACE: 1 IMAGE: x86_64-gnu-llvm-19 - DOCKER_SCRIPT: stage_2_test_set1.sh + DOCKER_SCRIPT: stage_2_test_set2.sh <<: *job-linux-4c # Skip tests that run in x86_64-gnu-llvm-19-{1,3} |