Skip to content

Commit d7ce8f0

Browse files
committed
Upgrade macOS image to 13
1 parent 1ec4e59 commit d7ce8f0

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/bors.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
contents: read # to fetch code (actions/checkout)
3939

4040
name: macOS
41-
runs-on: macos-12
41+
runs-on: macos-13
4242
strategy:
4343
fail-fast: true
4444
matrix:
@@ -262,17 +262,17 @@ jobs:
262262
max-parallel: 4
263263
matrix:
264264
target:
265-
- { toolchain: stable, os: macos-12 }
266-
- { toolchain: beta, os: macos-12 }
267-
- { toolchain: nightly, os: macos-12 }
265+
- { toolchain: stable, os: macos-13, deployment-target: 13.6 }
266+
- { toolchain: beta, os: macos-13, deployment-target: 13.6 }
267+
- { toolchain: nightly, os: macos-13, deployment-target: 13.6 }
268268
# Use macOS 11 for older toolchains as newer Xcode donesn't work well.
269269
# FIXME: Disabled due to:
270270
# error: failed to parse registry's information for: serde
271271
#- { toolchain: 1.13.0, os: macos-11 }
272-
- { toolchain: 1.19.0, os: macos-11 }
273-
- { toolchain: 1.24.0, os: macos-11 }
274-
- { toolchain: 1.25.0, os: macos-11 }
275-
- { toolchain: 1.30.0, os: macos-11 }
272+
- { toolchain: 1.19.0, os: macos-11, deployment-target: 11.7 }
273+
- { toolchain: 1.24.0, os: macos-11, deployment-target: 11.7 }
274+
- { toolchain: 1.25.0, os: macos-11, deployment-target: 11.7 }
275+
- { toolchain: 1.30.0, os: macos-11, deployment-target: 11.7 }
276276
runs-on: ${{ matrix.target.os }}
277277
steps:
278278
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
@@ -282,7 +282,7 @@ jobs:
282282
- name: Setup Rust toolchain
283283
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
284284
- name: Execute build.sh
285-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
285+
run: LIBC_CI=1 MACOSX_DEPLOYMENT_TARGET=${{ matrix.target.deployment-target }} TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
286286

287287
build_channels_windows:
288288
permissions:

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
macos:
3232
name: macOS
33-
runs-on: macos-12
33+
runs-on: macos-13
3434
strategy:
3535
fail-fast: true
3636
matrix:
@@ -42,7 +42,7 @@ jobs:
4242
- name: Setup Rust toolchain
4343
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
4444
- name: Execute run.sh
45-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
45+
run: LIBC_CI=1 MACOSX_DEPLOYMENT_TARGET='13.6' sh ./ci/run.sh ${{ matrix.target }}
4646

4747
windows:
4848
name: Windows

0 commit comments

Comments
 (0)