Auto merge of #3442 - JohnTitor:macos-13, r=JohnTitor

Upgrade macOS image to 13
rust-lang · Nov 14, 2023 · 793cfe9 · 793cfe9
2 parents 1ec4e59 + d7ce8f0
commit 793cfe9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
@@ -38,7 +38,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: macOS
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       fail-fast: true
       matrix:
@@ -262,17 +262,17 @@ jobs:
       max-parallel: 4
       matrix:
         target:
-          - { toolchain: stable, os: macos-12 }
-          - { toolchain: beta, os: macos-12 }
-          - { toolchain: nightly, os: macos-12 }
+          - { toolchain: stable, os: macos-13, deployment-target: 13.6 }
+          - { toolchain: beta, os: macos-13, deployment-target: 13.6 }
+          - { toolchain: nightly, os: macos-13, deployment-target: 13.6 }
           # Use macOS 11 for older toolchains as newer Xcode donesn't work well.
           # FIXME: Disabled due to:
           # error: failed to parse registry's information for: serde
           #- { 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 }
+          - { toolchain: 1.19.0, os: macos-11, deployment-target: 11.7 }
+          - { toolchain: 1.24.0, os: macos-11, deployment-target: 11.7 }
+          - { toolchain: 1.25.0, os: macos-11, deployment-target: 11.7 }
+          - { toolchain: 1.30.0, os: macos-11, deployment-target: 11.7 }
     runs-on: ${{ matrix.target.os }}
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
@@ -282,7 +282,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
+        run: LIBC_CI=1 MACOSX_DEPLOYMENT_TARGET=${{ matrix.target.deployment-target }} TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
 
   build_channels_windows:
     permissions:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
 
   macos:
     name: macOS
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       fail-fast: true
       matrix:
@@ -42,7 +42,7 @@ jobs:
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
+        run: LIBC_CI=1 MACOSX_DEPLOYMENT_TARGET='13.6' sh ./ci/run.sh ${{ matrix.target }}
 
   windows:
     name: Windows