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

ci: Remove macOS 10 hack #6103

Merged
merged 1 commit into from
Jan 22, 2022
Merged

ci: Remove macOS 10 hack #6103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions .github/workflows/release_nightly.yml
View file
Open in desktop
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
View file
Open in desktop
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