Skip to content

Commit

Permalink
ci: Use macos-11 runner
Browse files Browse the repository at this point in the history
  • Loading branch information
Herschel committed Jan 22, 2022
1 parent e11e1e8 commit 97428aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/release_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,6 @@ jobs:
sudo apt-get update
sudo apt install -y libasound2-dev libxcb-shape0-dev libxcb-xfixes0-dev
# We need macOS SDK 11.0 to build for aarch64.
# GitHub Actions runners have the 11.0 SDK installed, but are still stuck on macOS 10.15.
# Various efforts of changing SDKPATH, CFLAGS, etc. to use the proper SDK have not compiled or linked correctly.
# This hack deletes all other SDKs which forces the build tools to use the proper version.
# Remove this hack when macOS 11 is publicly available on GitHub Actions.
# From https://github.com/actions/virtual-environments/issues/2211
- name: Set SDK for macOS aarch64
if: matrix.target == 'aarch64-apple-darwin'
run: |
sudo xcode-select -s "/Applications/Xcode_12.4.app"
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
- name: Cargo build
uses: actions-rs/cargo@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fail-fast: false
matrix:
rust_version: [stable]
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- rust_version: nightly
os: ubuntu-latest
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
matrix:
rust_version: [stable]
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- rust_version: nightly
os: ubuntu-latest
Expand Down

0 comments on commit 97428aa

Please sign in to comment.