Skip to content

Commit 94d40b2

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#126244
Rollup merge of rust-lang#126244 - erickt:bump, r=Kobzol 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 bfa098e + 14014ab commit 94d40b2

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2626
# Duplicated in dist-various-2 Dockerfile.
2727
# FIXME: Move to canonical triple
2828
ENV \
29-
AR_x86_64_fuchsia=x86_64-unknown-fuchsia-ar \
30-
CC_x86_64_fuchsia=x86_64-unknown-fuchsia-clang \
31-
CFLAGS_x86_64_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
32-
CXX_x86_64_fuchsia=x86_64-unknown-fuchsia-clang++ \
33-
CXXFLAGS_x86_64_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
34-
LDFLAGS_x86_64_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib"
29+
AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \
30+
CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \
31+
CFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
32+
CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \
33+
CXXFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \
34+
LDFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib"
3535

3636
WORKDIR /tmp
3737
COPY scripts/shared.sh /tmp/
3838
COPY scripts/build-fuchsia-toolchain.sh /tmp/
3939
RUN /tmp/build-fuchsia-toolchain.sh
4040

41-
ENV CARGO_TARGET_X86_64_FUCHSIA_AR /usr/local/bin/llvm-ar
42-
ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \
41+
ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
42+
ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \
4343
-C panic=abort \
4444
-C force-unwind-tables=yes \
4545
-C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \
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-fuchsia
49+
ENV TARGETS=x86_64-unknown-fuchsia
5050
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
5151
ENV TARGETS=$TARGETS,wasm32-unknown-unknown
5252

@@ -69,11 +69,11 @@ ENV RUST_CONFIGURE_ARGS \
6969
--llvm-libunwind=in-tree \
7070
--enable-extended \
7171
--disable-docs \
72-
--set target.x86_64-fuchsia.cc=/usr/local/bin/clang \
73-
--set target.x86_64-fuchsia.cxx=/usr/local/bin/clang++ \
74-
--set target.x86_64-fuchsia.ar=/usr/local/bin/llvm-ar \
75-
--set target.x86_64-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \
76-
--set target.x86_64-fuchsia.linker=/usr/local/bin/ld.lld
72+
--set target.x86_64-unknown-fuchsia.cc=/usr/local/bin/clang \
73+
--set target.x86_64-unknown-fuchsia.cxx=/usr/local/bin/clang++ \
74+
--set target.x86_64-unknown-fuchsia.ar=/usr/local/bin/llvm-ar \
75+
--set target.x86_64-unknown-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \
76+
--set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld
7777
ENV SCRIPT \
7878
python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
7979
bash ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh

‎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=737ebdd83afa47b742ca8325fad0176952fcefbd
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)