From 1436467e87701559cdc2fbc653f5a0a14275baeb Mon Sep 17 00:00:00 2001
From: Jake Goulding <jake.goulding@gmail.com>
Date: Mon, 2 Oct 2023 20:33:20 -0400
Subject: [PATCH] Perform try builds for aarch64-apple-darwin

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff77a6c6606b..f53dc731b9c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -545,9 +545,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: dist-x86_64-linux
-            os: ubuntu-20.04-16core-64gb
-            env: {}
+          - name: dist-aarch64-apple
+            env:
+              SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
+              RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
+              RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
+              SELECT_XCODE: /Applications/Xcode_13.4.1.app
+              USE_XCODE_CLANG: 1
+              MACOSX_DEPLOYMENT_TARGET: 11.0
+              MACOSX_STD_DEPLOYMENT_TARGET: 11.0
+              NO_LLVM_ASSERTIONS: 1
+              NO_DEBUG_ASSERTIONS: 1
+              NO_OVERFLOW_CHECKS: 1
+              DIST_REQUIRE_ALL_TOOLS: 1
+            os: macos-13-xlarge
     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 ce189a336470..53990a37b645 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -527,7 +527,8 @@ jobs:
             <<: *job-macos-xl
 
           # This target only needs to support 11.0 and up as nothing else supports the hardware
-          - name: dist-aarch64-apple
+          - &dist-aarch64-apple
+            name: dist-aarch64-apple
             env:
               SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
               RUST_CONFIGURE_ARGS: >-
@@ -687,9 +688,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - &dist-x86_64-linux
-            name: dist-x86_64-linux
-            <<: *job-linux-16c
+          - <<: *dist-aarch64-apple
 
   master:
     name: master