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.

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

fix macos arm64 build #284

Merged
merged 1 commit into from
Jul 25, 2023
Merged
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
env:
TARGET: x86_64-apple-darwin
ARCHIVE_NAME: wgpu-macos-x86_64
MACOSX_DEPLOYMENT_TARGET: 10.13
MACOSX_DEPLOYMENT_TARGET: "10.13"
steps:
# Common part (same for each build)
- uses: actions/checkout@v3
Expand All @@ -168,11 +168,6 @@ jobs:
with:
targets: ${{ env.TARGET }}
# Build
- name: Select XCode version
run:
xcode_app=$(ls -1v /Applications/Xcode_*.app | tail -1)
echo $xcode_app
sudo xcode-select -s "$xcode_app"
- name: Build
run: make package
# Upload (same for each build)
Expand All @@ -190,6 +185,7 @@ jobs:
env:
TARGET: aarch64-apple-darwin
ARCHIVE_NAME: wgpu-macos-arm64
MACOSX_DEPLOYMENT_TARGET: "11.0"
steps:
# Common part (same for each build)
- uses: actions/checkout@v3
Expand All @@ -203,13 +199,8 @@ jobs:
with:
targets: ${{ env.TARGET }}
# Build
- name: Select XCode version
run:
xcode_app=$(ls -1v /Applications/Xcode_*.app | tail -1)
echo $xcode_app
sudo xcode-select -s "$xcode_app"
- name: Build
run: SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version) make package
run: make package
# Upload (same for each build)
- name: Upload
uses: actions/upload-artifact@v3
Expand Down
Loading