diff options
| author | bors <bors@rust-lang.org> | 2022-10-14 22:56:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-14 22:56:53 +0000 |
| commit | 8147e6e427a1b3c4aedcd9fd85bd457888f80972 (patch) | |
| tree | a52cac2a5c92bedd81aff8169141a4ef382bdabd /src/ci/docker | |
| parent | bf15a9e5263fcea065a7ae9c179b2d24c2deb670 (diff) | |
| parent | a96f1a8a1eef38f024d6fcff932f55a2a760a395 (diff) | |
| download | rust-8147e6e427a1b3c4aedcd9fd85bd457888f80972.tar.gz rust-8147e6e427a1b3c4aedcd9fd85bd457888f80972.zip | |
Auto merge of #103069 - matthiaskrgr:rollup-xxsx6sk, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #102092 (refactor: use grep -E/-F instead of fgrep/egrep)
- #102781 (Improved documentation for `std::io::Error`)
- #103017 (Avoid dropping TLS Key on sgx)
- #103039 (checktools: fix comments)
- #103045 (Remove leading newlines from integer primitive doc examples)
- #103047 (Update browser-ui-test version to fix some flaky tests)
- #103054 (Clean up rust-logo rustdoc GUI test)
- #103059 (Fix `Duration::{try_,}from_secs_f{32,64}(-0.0)`)
- #103067 (More alphabetical sorting)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version | 2 | ||||
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version index d61567cd134..7fd0b1e8e6f 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version @@ -1 +1 @@ -0.12.3 \ No newline at end of file +0.12.4 \ No newline at end of file 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 cf00c285b0a..3e1f39eaab5 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 @@ -4,7 +4,7 @@ set -eu X_PY="$1" -# Try to test all the tools and store the build/test success in the TOOLSTATE_FILE +# Try to test the toolstate-tracked tools and store the build/test success in the TOOLSTATE_FILE. set +e python3 "$X_PY" test --stage 2 --no-fail-fast \ @@ -19,6 +19,8 @@ set -e # debugging: print out the saved toolstates cat /tmp/toolstate/toolstates.json + +# Test remaining tools that must pass. python3 "$X_PY" test --stage 2 check-tools python3 "$X_PY" test --stage 2 src/tools/clippy python3 "$X_PY" test --stage 2 src/tools/rustfmt |