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

Build Fuchsia tests in CI This would have caught rust-lang/rust-clippy#11952.
rust-lang · Dec 29, 2023 · 21d39f0 · 21d39f0
2 parents fb5ed72 + 97b9519
commit 21d39f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -579,10 +579,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/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
@@ -6,7 +6,9 @@
 set -euf -o pipefail
 
 INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768
-PICK_REFS=()
+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
@@ -732,11 +732,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: