Skip to content

Commit 54af2e5

Browse files
committed
Use macOS 11 for older toolchains
Signed-off-by: Yuki Okushi <[email protected]>
1 parent ae14fc9 commit 54af2e5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/bors.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -259,32 +259,32 @@ jobs:
259259

260260
name: Build Channels macOS
261261
needs: macos
262-
runs-on: macos-12
263262
env:
264263
OS: macos
265264
strategy:
266265
fail-fast: true
267266
max-parallel: 4
268267
matrix:
269-
toolchain: [
270-
stable,
271-
beta,
272-
nightly,
273-
1.13.0,
274-
1.19.0,
275-
1.24.0,
276-
1.25.0,
277-
1.30.0,
278-
]
268+
target:
269+
- { toolchain: stable, os: macos-12 }
270+
- { toolchain: beta, os: macos-12 }
271+
- { toolchain: nightly, os: macos-12 }
272+
# Use macOS 11 for older toolchains as newer Xcode donesn't work well.
273+
- { toolchain: 1.13.0, os: macos-11 }
274+
- { toolchain: 1.19.0, os: macos-11 }
275+
- { toolchain: 1.24.0, os: macos-11 }
276+
- { toolchain: 1.25.0, os: macos-11 }
277+
- { toolchain: 1.30.0, os: macos-11 }
278+
runs-on: ${{ matrix.target.os }}
279279
steps:
280280
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
281281
with:
282282
github_token: "${{ secrets.GITHUB_TOKEN }}"
283283
- uses: actions/checkout@v3
284284
- name: Setup Rust toolchain
285-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
285+
run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
286286
- name: Execute build.sh
287-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
287+
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/build.sh
288288

289289
build_channels_windows:
290290
permissions:

0 commit comments

Comments
 (0)