Skip to content

Commit df32486

Browse files
authored
Merge pull request #2521 from shepmaster/aarch64-apple-darwin
Build for aarch64-apple-darwin
2 parents 0a74013 + b46366e commit df32486

File tree

4 files changed

+43
-8
lines changed

4 files changed

+43
-8
lines changed

.github/workflows/macos-builds-on-all.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
matrix:
2222
target:
2323
- x86_64-apple-darwin
24+
- aarch64-apple-darwin
2425
steps:
2526
- uses: actions/checkout@v2
2627
with:
@@ -68,6 +69,22 @@ jobs:
6869
rustup toolchain uninstall stable
6970
fi
7071
rustup toolchain install --profile=minimal stable
72+
- name: aarch64-specific items
73+
run: |
74+
# Use nightly for now
75+
rustup toolchain install --profile=minimal nightly
76+
rustup default nightly
77+
78+
# Can't run tests: cross-compiling
79+
echo "SKIP_TESTS=yes" >> $GITHUB_ENV
80+
81+
# Use the beta compiler
82+
sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/
83+
84+
# Set SDK environment variables
85+
echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
86+
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
87+
if: matrix.target == 'aarch64-apple-darwin'
7188
- name: Ensure we have our goal target installed
7289
run: |
7390
rustup target install "$TARGET"

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/actions-templates/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ system.
5959
| x86_64-linux-android | Yes | Two | No | No |
6060
| riscv64gc-unknown-linux-gnu | Yes | --- | No | No |
6161
| ----------------------------- | ---------- | ----- | ------ | ---------- |
62+
| aarch64-apple-darwin | Yes | Two | Yes | Yes |
6263
| x86_64-apple-darwin | No | One | Yes | Yes |
6364
| ----------------------------- | ---------- | ----- | ------ | ---------- |
6465
| x86_64-pc-windows-msvc | No | One | Yes | Yes |

ci/actions-templates/macos-builds-template.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
matrix:
2222
target:
2323
- x86_64-apple-darwin
24+
- aarch64-apple-darwin
2425
steps:
2526
- uses: actions/checkout@v2
2627
with:
@@ -68,6 +69,22 @@ jobs:
6869
rustup toolchain uninstall stable
6970
fi
7071
rustup toolchain install --profile=minimal stable
72+
- name: aarch64-specific items
73+
run: |
74+
# Use nightly for now
75+
rustup toolchain install --profile=minimal nightly
76+
rustup default nightly
77+
78+
# Can't run tests: cross-compiling
79+
echo "SKIP_TESTS=yes" >> $GITHUB_ENV
80+
81+
# Use the beta compiler
82+
sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/
83+
84+
# Set SDK environment variables
85+
echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
86+
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
87+
if: matrix.target == 'aarch64-apple-darwin'
7188
- name: Ensure we have our goal target installed
7289
run: |
7390
rustup target install "$TARGET"

0 commit comments

Comments
 (0)