From 013a92b2c9356ad73216b6260ef566bd18c100f0 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 19 Mar 2025 04:03:31 +0000 Subject: [PATCH] Update Fuchsia toolchain, SDK, and checkout This patch: * Updates the Fuchsia checkout to the current tip-of-tree version https://fuchsia.googlesource.com/integration/+/e4894a025ac83d6051cf874ba45d71bc40eaa49a * Updates the clang toolchain to the version used to build the tip-of-tree version 684052173971868aab0e6b62d7770a6299e84141. * Updates the Fuchsia SDK to 27.20250319.0.1. try-job: x86_64-fuchsia --- .../host-x86_64/x86_64-fuchsia/build-fuchsia.sh | 2 +- .../docker/scripts/build-fuchsia-toolchain.sh | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh index d0a138b79033b..1df4fa08ed85f 100755 --- a/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh +++ b/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh @@ -35,7 +35,7 @@ PICK_REFS=() # commit hash of fuchsia.git and some other repos in the "monorepo" checkout, in # addition to versions of prebuilts. It should be bumped regularly by the # Fuchsia team – we aim for every 1-2 months. -INTEGRATION_SHA=f6f83d3e3852209f7752be55694006afbe979e50 +INTEGRATION_SHA=e4894a025ac83d6051cf874ba45d71bc40eaa49a checkout=fuchsia jiri=.jiri_root/bin/jiri diff --git a/src/ci/docker/scripts/build-fuchsia-toolchain.sh b/src/ci/docker/scripts/build-fuchsia-toolchain.sh index 3c65a52ada76b..666670e38b93e 100755 --- a/src/ci/docker/scripts/build-fuchsia-toolchain.sh +++ b/src/ci/docker/scripts/build-fuchsia-toolchain.sh @@ -3,14 +3,23 @@ set -ex source shared.sh +# The Fuchsia SDK is used to set up a Fuchsia test environment. The latest version can be found at: +# the latest Fuchsia checkout is found at: +# https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core/linux-amd64/+/latest FUCHSIA_SDK_URL=https://chrome-infra-packages.appspot.com/dl/fuchsia/sdk/core/linux-amd64 -FUCHSIA_SDK_ID=version:26.20241211.7.1 -FUCHSIA_SDK_SHA256=2cb7a9a0419f7413a46e0ccef7dad89f7c9979940d7c1ee87fac70ff499757d6 +FUCHSIA_SDK_ID=version:27.20250319.0.1 +FUCHSIA_SDK_SHA256=0b0eeed62b024d8910917a797d658098a312b7674c3742292b40ba10aa56ea8e FUCHSIA_SDK_USR_DIR=/usr/local/core-linux-amd64-fuchsia-sdk + +# The Clang toolchain used to compile Fuchsia. The version currently used by +# the latest Fuchsia checkout is found in: +# https://fuchsia.googlesource.com/integration/+/refs/heads/main/toolchain. The +# CIPD artifacts are found in: +# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang/linux-amd64 CLANG_DOWNLOAD_URL=\ https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64 -CLANG_DOWNLOAD_ID=git_revision:388d7f144880dcd85ff31f06793304405a9f44b6 -CLANG_DOWNLOAD_SHA256=970d1f427b9c9a3049d8622c80c86830ff31b5334ad8da47a2f1e81143197e8b +CLANG_DOWNLOAD_ID=git_revision:684052173971868aab0e6b62d7770a6299e84141 +CLANG_DOWNLOAD_SHA256=e82b7f96e1215d68fb8d39f21fdc5020ee4683baae247ac553017f65819bc409 install_clang() { mkdir -p clang_download