Skip to content

Commit 6765289

Browse files
committed
Auto merge of #126244 - erickt:bump, r=<try>
Update fuchsia commit, and SDK to 21.20240610.2.1 This includes a fix to the race when publishing multiple packages at the same time. try-job: x86_64-gnu-integration
2 parents 9a7bf4a + c71e249 commit 6765289

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PICK_REFS=()
3535
# commit hash of fuchsia.git and some other repos in the "monorepo" checkout, in
3636
# addition to versions of prebuilts. It should be bumped regularly by the
3737
# Fuchsia team – we aim for every 1-2 months.
38-
INTEGRATION_SHA=1011e3298775ee7cdf6f6dc73e808d6a86e33bd6
38+
INTEGRATION_SHA=3284806a4788c4ead8413908026699723dd2ffba
3939

4040
checkout=fuchsia
4141
jiri=.jiri_root/bin/jiri

src/ci/docker/scripts/build-fuchsia-toolchain.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ set -ex
44
source shared.sh
55

66
FUCHSIA_SDK_URL=https://chrome-infra-packages.appspot.com/dl/fuchsia/sdk/core/linux-amd64
7-
FUCHSIA_SDK_ID=version:20.20240412.3.1
8-
FUCHSIA_SDK_SHA256=cc52f3497487dd813c89d9316e6967efcea89c7759edccf3e40fcf3662e53f19
7+
FUCHSIA_SDK_ID=version:21.20240610.2.1
8+
FUCHSIA_SDK_SHA256=2d2d057fc3f0404197cced2200f88cbcdaaf5fbf6475955045091f8676791ce7
99
FUCHSIA_SDK_USR_DIR=/usr/local/core-linux-amd64-fuchsia-sdk
1010
CLANG_DOWNLOAD_URL=\
1111
https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64
12-
CLANG_DOWNLOAD_ID=git_revision:c777c011a709dffd4fa5e79cad7947b7c3405d02
13-
CLANG_DOWNLOAD_SHA256=779167422ad73c292f049dcea5569f84577af9292189ed2749518b966a4d0844
12+
CLANG_DOWNLOAD_ID=git_revision:3809e20afc68d7d03821f0ec59b928dcf9befbf4
13+
CLANG_DOWNLOAD_SHA256=3c2c442b61cd9e8f1b567738f6d53cffe11b3fc820e7dae87a82a0859be8f204
1414

1515
install_clang() {
1616
mkdir -p clang_download

src/ci/docker/scripts/fuchsia-test-runner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ def start(self):
286286
# Look up the product bundle transfer manifest.
287287
self.log_info("Looking up the product bundle transfer manifest...")
288288
product_name = "minimal." + self.triple_to_arch(self.target)
289-
fuchsia_version = "20.20240412.3.1"
289+
fuchsia_version = "21.20240610.2.1"
290290

291291
out = self.check_output(
292292
[

0 commit comments

Comments
 (0)