Skip to content

Commit cdaa12e

Browse files
committed
Auto merge of #120358 - tmandry:bump-fuchsia-8c-tests, r=Mark-Simulacrum
Bump Fuchsia, build tests, and use 8 core bots - Build Fuchsia on 8 cores instead of 16 - Skip building cranelift for Fuchsia - Bump Fuchsia (includes building tests) This includes a change to the upstream build_fuchsia_from_rust_ci script that builds a minimal set of tests, to improve coverage on this builder. This would have caught rust-lang/rust-clippy#11952 and #119593. See prior discussion on #119400 about building on 8 cores instead of 16. This PR combines changes from that and #119399, plus clean up. r? `@Mark-Simulacrum`
2 parents d53ddcd + afd5edc commit cdaa12e

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
- name: x86_64-gnu-integration
295295
env:
296296
CI_ONLY_WHEN_CHANNEL: nightly
297-
os: ubuntu-20.04-16core-64gb
297+
os: ubuntu-20.04-8core-32gb
298298
- name: x86_64-gnu-debug
299299
os: ubuntu-20.04-8core-32gb
300300
env: {}

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

+4
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@ ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \
4444

4545
ENV TARGETS=x86_64-fuchsia
4646
ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
47+
ENV TARGETS=$TARGETS,wasm32-unknown-unknown
4748

4849
COPY scripts/sccache.sh /scripts/
4950
RUN sh /scripts/sccache.sh
5051

5152
ENV RUST_INSTALL_DIR /checkout/obj/install
5253
RUN mkdir -p $RUST_INSTALL_DIR/etc
5354

55+
# Fuchsia only supports LLVM.
56+
ENV CODEGEN_BACKENDS llvm
57+
5458
ENV RUST_CONFIGURE_ARGS \
5559
--prefix=$RUST_INSTALL_DIR \
5660
--sysconfdir=etc \

src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -euf -o pipefail
77

8-
INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768
8+
INTEGRATION_SHA=56310bca298872ffb5ea02e665956d9b6dc41171
99
PICK_REFS=()
1010

1111
checkout=fuchsia

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ jobs:
478478
# nightly features to compile, and this job would fail if
479479
# executed on beta and stable.
480480
CI_ONLY_WHEN_CHANNEL: nightly
481-
<<: *job-linux-16c
481+
<<: *job-linux-8c
482482

483483
- name: x86_64-gnu-debug
484484
<<: *job-linux-8c

src/ci/run.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
119119
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
120120
fi
121121

122-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm}"
122+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm}"
123+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
123124
else
124125
# We almost always want debug assertions enabled, but sometimes this takes too
125126
# long for too little benefit, so we just turn them off.
@@ -144,11 +145,12 @@ else
144145
# tests as it will fail them.
145146
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
146147
# Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
147-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc"
148+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift,gcc}"
148149
else
149150
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
150-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
151+
CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm,cranelift}"
151152
fi
153+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
152154

153155
# We enable this for non-dist builders, since those aren't trying to produce
154156
# fresh binaries. We currently don't entirely support distributing a fresh

0 commit comments

Comments
 (0)