Auto merge of #132294 - tmandry:bump-fuchsia, r=<try>

Bump Fuchsia r? `@Kobzol` try-job: x86_64-fuchsia https://fxbug.dev/376114512
rust-lang · Oct 30, 2024 · 87b1a63 · 87b1a63
2 parents 759e07f + 40c00f1
commit 87b1a63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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