diff options
| author | bors <bors@rust-lang.org> | 2023-04-24 01:18:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-24 01:18:16 +0000 |
| commit | 890fc93b7e7daac55d0224cd47ce276f24e51a81 (patch) | |
| tree | a933e3be1bce35af296a2e0a3366db372541b677 | |
| parent | 01eb85d61cc43c8ed6e7530c970a1ac400cd746f (diff) | |
| parent | 54af2e52a9febef1ec75b2dcefa06508c1c7e63c (diff) | |
| download | rust-libc-890fc93b7e7daac55d0224cd47ce276f24e51a81.tar.gz | |
Auto merge of #3219 - JohnTitor:macos-12, r=JohnTitor
Upgrade CI image to macOS 12
The linked issue was closed, let's see if we can use macOS 12.
| -rw-r--r-- | .github/workflows/bors.yml | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 02bb131037..c295f332ae 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -259,36 +259,32 @@ 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 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: |