From ae14fc9387b2d1480da744acac2fe8577104b40f Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Sun, 23 Apr 2023 10:56:14 +0900
Subject: [PATCH 1/2] Upgrade CI image to macOS 12

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 .github/workflows/bors.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
index 02bb131037541..39fe8c8483ef9 100644
--- a/.github/workflows/bors.yml
+++ b/.github/workflows/bors.yml
@@ -259,11 +259,7 @@ jobs:
 
     name: Build Channels macOS
     needs: macos
-    # FIXME: Use macOS 11 for now as CI failed with a linker error on macOS 12 image:
-    # ld: in /.../x86_64-apple-darwin/lib/libstd-a4729905.rlib(rust.metadata.bin),
-    # archive member 'rust.metadata.bin' with length 2958149 is not mach-o or llvm bitcode file '/.../x86_64-apple-darwin/lib/libstd-a4729905.rlib'
-    # Possibly related: https://github.com/actions/runner-images/issues/6350
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       OS: macos
     strategy:

From 54af2e52a9febef1ec75b2dcefa06508c1c7e63c Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Mon, 24 Apr 2023 04:56:12 +0900
Subject: [PATCH 2/2] Use macOS 11 for older toolchains

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 .github/workflows/bors.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
index 39fe8c8483ef9..c295f332ae39e 100644
--- a/.github/workflows/bors.yml
+++ b/.github/workflows/bors.yml
@@ -259,32 +259,32 @@ jobs:
 
     name: Build Channels macOS
     needs: macos
-    runs-on: macos-12
     env:
       OS: macos
     strategy:
       fail-fast: true
       max-parallel: 4
       matrix:
-        toolchain: [
-          stable,
-          beta,
-          nightly,
-          1.13.0,
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-        ]
+        target:
+          - { toolchain: stable, os: macos-12 }
+          - { toolchain: beta, os: macos-12 }
+          - { toolchain: nightly, os: macos-12 }
+          # Use macOS 11 for older toolchains as newer Xcode donesn't work well.
+          - { toolchain: 1.13.0, os: macos-11 }
+          - { toolchain: 1.19.0, os: macos-11 }
+          - { toolchain: 1.24.0, os: macos-11 }
+          - { toolchain: 1.25.0, os: macos-11 }
+          - { toolchain: 1.30.0, os: macos-11 }
+    runs-on: ${{ matrix.target.os }}
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: actions/checkout@v3
       - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
+        run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
+        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
 
   build_channels_windows:
     permissions: