Skip to content

Commit 87b1a63

Browse files
committed
Auto merge of #132294 - tmandry:bump-fuchsia, r=<try>
Bump Fuchsia r? `@Kobzol` try-job: x86_64-fuchsia https://fxbug.dev/376114512
2 parents 759e07f + 40c00f1 commit 87b1a63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \
4646
-Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \
4747
-Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib
4848

49-
ENV TARGETS=x86_64-unknown-fuchsia
49+
ENV TARGETS=x86_64-unknown-fuchsia,aarch64-unknown-fuchsia
5050
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
5151

5252
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/x86_64-fuchsia/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=1c5b42266fbfefb2337c6b2f0030a91bde15f9e9
38+
INTEGRATION_SHA=f5ac405cd3ff735dbd2f213f5307326a1c9a5526
3939

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

0 commit comments

Comments
 (0)