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

Jump to bottom

Add Mac Catalyst to CI #1637

Merged
merged 2 commits into from
Sep 14, 2024
Merged

Add Mac Catalyst to CI #1637

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f60c69
Remove unnecessary SDKROOT/MACOS_DEPLOYMENT_TARGET setup in CI
madsmtm Sep 7, 2024
329424b
Add Mac Catalyst to CI
madsmtm Sep 7, 2024
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: 6 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,16 @@ jobs:
os: ubuntu-latest
- target: aarch64-apple-darwin
os: macos-latest
norun: true
norun: true # https://github.com/rust-lang/stdarch/issues/1206
- target: aarch64-apple-ios-macabi
os: macos-latest
norun: true # https://github.com/rust-lang/stdarch/issues/1206
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest
- target: x86_64-apple-darwin
os: macos-13
- target: x86_64-apple-ios-macabi
os: macos-13
- target: x86_64-pc-windows-msvc
os: windows-latest
- target: i686-pc-windows-msvc
Expand Down Expand Up @@ -185,11 +190,6 @@ jobs:
rustup default nightly
- run: rustup target add ${{ matrix.target }}
if: "!endsWith(matrix.target, 'emulated')"
- name: Setup (aarch64-apple-darwin)
run: |
echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
echo "MACOS_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
if: matrix.target == 'aarch64-apple-darwin'
- run: cargo generate-lockfile

# Configure some env vars based on matrix configuration
Expand Down