diff options
| author | bors <bors@rust-lang.org> | 2024-10-18 11:11:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-18 11:11:43 +0000 |
| commit | 1350eead10c46b9d3c2007fe0ea7892b7d7337ab (patch) | |
| tree | cb64b35fbe218b685fd687977266e5205562d645 /src | |
| parent | acfdb8dd1fd4913ea004f43f73e7346e125491ed (diff) | |
| parent | 80a8f7b0419cc8cbe987a5f68715a435b1654a18 (diff) | |
| download | rust-1350eead10c46b9d3c2007fe0ea7892b7d7337ab.tar.gz rust-1350eead10c46b9d3c2007fe0ea7892b7d7337ab.zip | |
Auto merge of #131887 - jieyouxu:rollup-ftik4ni, r=jieyouxu
Rollup of 9 pull requests Successful merges: - #130136 (Partially stabilize const_pin) - #131755 (Regression test for AVR `rjmp` offset) - #131774 (Add getentropy for RTEMS) - #131802 (Dont ICE when computing coverage of synthetic async closure body) - #131809 (Fix predicate signatures in retain_mut docs) - #131858 (Remove outdated documentation for `repeat_n`) - #131866 (Avoid use imports in `thread_local_inner!`) - #131874 (Default to the medium code model on OpenHarmony LoongArch target) - #131877 (checktools.sh: add link to issue for more context about disabled Miri tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh index 303a2f26c0f..8324d1ec586 100755 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh @@ -59,6 +59,8 @@ case $HOST_TARGET in # "error: cannot produce cdylib for ... as the target ... does not support these crate types". # Only run "pass" tests, which is quite a bit faster. #FIXME: Re-enable this once CI issues are fixed + # See <https://github.com/rust-lang/rust/issues/127883> + # For now, these tests are moved to `x86_64-msvc-ext2` in `src/ci/github-actions/jobs.yml`. #python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass #python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass ;; diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 11238cad3e7..d84b904442c 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -386,6 +386,8 @@ auto: <<: *job-windows-8c # Temporary builder to workaround CI issues + # See <https://github.com/rust-lang/rust/issues/127883> + #FIXME: Remove this, and re-enable the same tests in `checktools.sh`, once CI issues are fixed. - image: x86_64-msvc-ext2 env: SCRIPT: > |