diff options
| author | bors <bors@rust-lang.org> | 2024-06-14 07:08:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-14 07:08:40 +0000 |
| commit | d2ad293851dc8e14a61355d0358490b77efae8cb (patch) | |
| tree | d1bb879fb9d440b5e65d3cec890a33403eec9671 /src/ci/docker/scripts | |
| parent | bfa098eae0b5667a8cb5bbbe990a2d7e8445571f (diff) | |
| parent | 7f52e7d9c4776d791e1e9b12e4735c0ef6d305c4 (diff) | |
| download | rust-d2ad293851dc8e14a61355d0358490b77efae8cb.tar.gz rust-d2ad293851dc8e14a61355d0358490b77efae8cb.zip | |
Auto merge of #126462 - matthiaskrgr:rollup-g0t1am4, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - #126244 (Update fuchsia commit, and SDK to 21.20240610.2.1) - #126270 (Migrate run make const fn mir) - #126320 (Avoid ICES after reporting errors on erroneous patterns) - #126449 (Fill out missing Windows support information) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/build-fuchsia-toolchain.sh | 8 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/fuchsia-test-runner.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/docker/scripts/build-fuchsia-toolchain.sh b/src/ci/docker/scripts/build-fuchsia-toolchain.sh index 7a0d4fcffc1..027d412d250 100755 --- a/src/ci/docker/scripts/build-fuchsia-toolchain.sh +++ b/src/ci/docker/scripts/build-fuchsia-toolchain.sh @@ -4,13 +4,13 @@ set -ex source shared.sh FUCHSIA_SDK_URL=https://chrome-infra-packages.appspot.com/dl/fuchsia/sdk/core/linux-amd64 -FUCHSIA_SDK_ID=version:20.20240412.3.1 -FUCHSIA_SDK_SHA256=cc52f3497487dd813c89d9316e6967efcea89c7759edccf3e40fcf3662e53f19 +FUCHSIA_SDK_ID=version:21.20240610.2.1 +FUCHSIA_SDK_SHA256=2d2d057fc3f0404197cced2200f88cbcdaaf5fbf6475955045091f8676791ce7 FUCHSIA_SDK_USR_DIR=/usr/local/core-linux-amd64-fuchsia-sdk CLANG_DOWNLOAD_URL=\ https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64 -CLANG_DOWNLOAD_ID=git_revision:c777c011a709dffd4fa5e79cad7947b7c3405d02 -CLANG_DOWNLOAD_SHA256=779167422ad73c292f049dcea5569f84577af9292189ed2749518b966a4d0844 +CLANG_DOWNLOAD_ID=git_revision:3809e20afc68d7d03821f0ec59b928dcf9befbf4 +CLANG_DOWNLOAD_SHA256=3c2c442b61cd9e8f1b567738f6d53cffe11b3fc820e7dae87a82a0859be8f204 install_clang() { mkdir -p clang_download diff --git a/src/ci/docker/scripts/fuchsia-test-runner.py b/src/ci/docker/scripts/fuchsia-test-runner.py index 4f504341d52..d791550a8db 100755 --- a/src/ci/docker/scripts/fuchsia-test-runner.py +++ b/src/ci/docker/scripts/fuchsia-test-runner.py @@ -286,7 +286,7 @@ class TestEnvironment: # Look up the product bundle transfer manifest. self.log_info("Looking up the product bundle transfer manifest...") product_name = "minimal." + self.triple_to_arch(self.target) - fuchsia_version = "20.20240412.3.1" + fuchsia_version = "21.20240610.2.1" out = self.check_output( [ |