Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade CI image to macOS 12 #3219

Merged
merged 2 commits into from
Apr 24, 2023
Merged

Upgrade CI image to macOS 12 #3219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae14fc9
Upgrade CI image to macOS 12
JohnTitor Apr 23, 2023
54af2e5
Use macOS 11 for older toolchains
JohnTitor Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions .github/workflows/bors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down