From 40c00f1ab22ffb412f3a3bd5bc799179bcd9410f Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Mon, 28 Oct 2024 14:46:01 -0700 Subject: [PATCH] Bump Fuchsia --- src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile | 2 +- src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile index 0cae83a85b3a4..6fb06311305ca 100644 --- a/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile @@ -46,7 +46,7 @@ ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \ -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \ -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib -ENV TARGETS=x86_64-unknown-fuchsia +ENV TARGETS=x86_64-unknown-fuchsia,aarch64-unknown-fuchsia ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu COPY scripts/sccache.sh /scripts/ 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 1a0b141e984bc..1f317c87c07d0 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=1c5b42266fbfefb2337c6b2f0030a91bde15f9e9 +INTEGRATION_SHA=f5ac405cd3ff735dbd2f213f5307326a1c9a5526 checkout=fuchsia jiri=.jiri_root/bin/jiri