Skip to content

Commit

Permalink
Use xcode-select instead
Browse files Browse the repository at this point in the history
Embark seems to use xcode-select on GitHub Actions to switch to a newer
version of XCode instead of switching the macOS version itself:

https://twitter.com/Ca1ne/status/1372120481147535363
  • Loading branch information
CryZe committed Mar 17, 2021
1 parent 0d4316d commit 268e186
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ jobs:

# macOS
- macOS aarch64
# 32-bit macOS is deprecated and doesn't build:
# https://github.com/CryZe/livesplit-core/runs/220089673
# - macOS i686
- macOS x86_64

# iOS
Expand Down Expand Up @@ -469,20 +466,13 @@ jobs:
# macOS
- label: macOS aarch64
target: aarch64-apple-darwin
os: macOS-11.0
os: macOS-latest
cross: skip
tests: skip
install_target: true
# FIXME: Switch OS back to latest once that means 11.
# FIXME: Switch OS to ARM macOS once GitHub Actions provides that,
# FIXME: Switch OS to ARM macOS once GitHub Actions provides that,
# use the toolchain instead of the target and run the tests.

# - label: macOS i686
# target: i686-apple-darwin
# toolchain: stable-i686-apple-darwin
# os: macOS-latest
# cross: skip

- label: macOS x86_64
target: x86_64-apple-darwin
os: macOS-latest
Expand Down Expand Up @@ -621,6 +611,13 @@ jobs:
run: sh .github/workflows/install.sh
env:
OS_NAME: ${{ matrix.os }}
TARGET: ${{ matrix.target }}

- name: Select XCode to use
if: matrix.target == 'aarch64-apple-darwin'
run: |
sudo xcode-select -s "/Applications/Xcode_12.3.app"
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
- name: Build Static Library
run: sh .github/workflows/build_static.sh
Expand Down

0 comments on commit 268e186

Please sign in to comment.