Auto merge of rust-lang#119399 - tmandry:build-fuchsia-tests, r=<try>

Build Fuchsia tests in CI This would have caught rust-lang/rust-clippy#11952 and rust-lang#119593.
rust-lang-ci · Jan 24, 2024 · c8259ec · c8259ec
2 parents 7ffc697 + ed3db05
commit c8259ec
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -567,10 +567,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: dist-x86_64-linux
-            env:
-              CODEGEN_BACKENDS: "llvm,cranelift"
+          - name: x86_64-gnu-integration
             os: ubuntu-20.04-16core-64gb
+            env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile
@@ -44,13 +44,17 @@ ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \
 
 ENV TARGETS=x86_64-fuchsia
 ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
+ENV TARGETS=$TARGETS,wasm32-unknown-unknown
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 ENV RUST_INSTALL_DIR /checkout/obj/install
 RUN mkdir -p $RUST_INSTALL_DIR/etc
 
+# Fuchsia only supports LLVM.
+ENV CODEGEN_BACKENDS llvm
+
 ENV RUST_CONFIGURE_ARGS \
   --prefix=$RUST_INSTALL_DIR \
   --sysconfdir=etc \

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
@@ -5,8 +5,10 @@
 
 set -euf -o pipefail
 
-INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768
-PICK_REFS=()
+INTEGRATION_SHA=8b634b0c1e80a829e46fe9cfa800a9ae72da8b56
+PICK_REFS=(
+    refs/changes/86/965586/2
+)
 
 checkout=fuchsia
 jiri=.jiri_root/bin/jiri

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -724,11 +724,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - &dist-x86_64-linux
-            name: dist-x86_64-linux
-            env:
-              CODEGEN_BACKENDS: llvm,cranelift
+          - name: x86_64-gnu-integration
             <<: *job-linux-16c
+          #- &dist-x86_64-linux
+          #  name: dist-x86_64-linux
+          #  env:
+          #    CODEGEN_BACKENDS: llvm,cranelift
+          #  <<: *job-linux-16c
 
 
   master:

diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -144,10 +144,10 @@ else
   # tests as it will fail them.
   if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
     # Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on.
-    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc"
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift,gcc}"
   else
     # Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
-    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift}"
   fi
 
   # We enable this for non-dist builders, since those aren't trying to produce