summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2023-04-24 04:56:12 +0900
committerYuki Okushi <jtitor@2k36.org>2023-04-24 04:56:12 +0900
commit54af2e52a9febef1ec75b2dcefa06508c1c7e63c (patch)
treea933e3be1bce35af296a2e0a3366db372541b677
parentae14fc9387b2d1480da744acac2fe8577104b40f (diff)
downloadrust-libc-54af2e52a9febef1ec75b2dcefa06508c1c7e63c.tar.gz
Use macOS 11 for older toolchains
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
-rw-r--r--.github/workflows/bors.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
index 39fe8c8483..c295f332ae 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: