Skip to content

Commit 7d7e6b5

Browse files
committed
CI: add windows-arm runner
1 parent 9675a3d commit 7d7e6b5

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
os: macos-latest
4646
- host_target: i686-pc-windows-msvc
4747
os: windows-latest
48+
- host_target: aarch64-pc-windows-msvc
49+
os: windows-11-arm
4850
runs-on: ${{ matrix.os }}
4951
env:
5052
HOST_TARGET: ${{ matrix.host_target }}
@@ -63,6 +65,12 @@ jobs:
6365
sudo apt update
6466
# Install needed packages
6567
sudo apt install $(echo "libatomic1: zlib1g-dev:" | sed 's/:/:${{ matrix.multiarch }}/g')
68+
- name: Install rustup on Windows ARM
69+
if: ${{ matrix.os == 'windows-11-arm' }}
70+
run: |
71+
curl -LOs https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
72+
./rustup-init.exe -y --no-modify-path
73+
echo "$USERPROFILE/.cargo/bin" >> "$GITHUB_PATH"
6674
- uses: ./.github/workflows/setup
6775
with:
6876
toolchain_flags: "--host ${{ matrix.host_target }}"

ci/ci.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ case $HOST_TARGET in
142142
# Host
143143
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
144144
# Extra tier 1
145-
MANY_SEEDS=64 TEST_TARGET=i686-unknown-linux-gnu run_tests
146145
MANY_SEEDS=64 TEST_TARGET=x86_64-apple-darwin run_tests
147146
MANY_SEEDS=64 TEST_TARGET=x86_64-pc-windows-gnu run_tests
148147
;;
@@ -161,8 +160,6 @@ case $HOST_TARGET in
161160
aarch64-unknown-linux-gnu)
162161
# Host
163162
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
164-
# Extra tier 1 candidate
165-
MANY_SEEDS=64 TEST_TARGET=aarch64-pc-windows-msvc run_tests
166163
# Extra tier 2
167164
MANY_SEEDS=16 TEST_TARGET=arm-unknown-linux-gnueabi run_tests # 32bit ARM
168165
MANY_SEEDS=16 TEST_TARGET=aarch64-pc-windows-gnullvm run_tests # gnullvm ABI
@@ -196,6 +193,11 @@ case $HOST_TARGET in
196193
# and a 64bit target works on a 32bit host.
197194
TEST_TARGET=x86_64-unknown-linux-gnu run_tests
198195
;;
196+
aarch64-pc-windows-msvc)
197+
# Host
198+
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
199+
# Extra tier 1
200+
MANY_SEEDS=64 TEST_TARGET=i686-unknown-linux-gnu run_tests
199201
*)
200202
echo "FATAL: unknown host target: $HOST_TARGET"
201203
exit 1

0 commit comments

Comments
 (0)