From 7341a73329a0589c49c112613a746ee5ef9494a0 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@google.com>
Date: Thu, 28 Dec 2023 16:02:55 -0800
Subject: [PATCH 1/2] Build Fuchsia tests in CI

This would have caught
https://github.com/rust-lang/rust-clippy/issues/11952.
---
 .../host-x86_64/x86_64-gnu-integration/build-fuchsia.sh       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
index 4a246f591d717..214411353f743 100755
--- 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

From 97b9519cda4858bffcf36359a7196ac41657fcb7 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@google.com>
Date: Thu, 28 Dec 2023 16:15:55 -0800
Subject: [PATCH 2/2] Run integration in @bors try

---
 .github/workflows/ci.yml     |  5 ++---
 src/ci/github-actions/ci.yml | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 540e1eb157e2f..2c599578be97d 100644
--- 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/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 3af370bf006ad..af5e5bdc62387 100644
--- 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: