Skip to content

Commit 6677d07

Browse files
committed
TEMP: Use public Win Arm64 runners
1 parent a997157 commit 6677d07

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ jobs:
134134
- name: show the current environment
135135
run: src/ci/scripts/dump-environment.sh
136136

137+
- name: install rust
138+
run: src/ci/scripts/install-rust.sh
139+
137140
- name: install awscli
138141
run: src/ci/scripts/install-awscli.sh
139142

src/ci/github-actions/jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runners:
4848
<<: *base-job
4949

5050
- &job-windows-aarch64
51-
os: windows-11-arm64-8core-32gb
51+
os: windows-11-arm
5252
<<: *base-job
5353

5454
- &job-aarch64-linux

src/ci/scripts/install-clang.sh

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ elif isWindows && ! isKnownToBeMingwBuild; then
6565
# Disable downloading CI LLVM on this builder;
6666
# setting up clang-cl just above conflicts with the default if-unchanged option.
6767
ciCommandSetEnv NO_DOWNLOAD_CI_LLVM 1
68+
69+
# On Arm64, the Ring crate requires that Clang be on the PATH.
70+
# https://github.com/briansmith/ring/blob/main/BUILDING.md
71+
ciCommandAddPath "$(pwd)/clang-rust/bin"
6872
fi
6973

7074
if isWindows; then

src/ci/scripts/install-rust.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
# For mingw builds use a vendored mingw.
3+
4+
set -euo pipefail
5+
IFS=$'\n\t'
6+
7+
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
8+
9+
if isWindows; then
10+
case "${CI_JOB_NAME}" in
11+
*aarch64*)
12+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -q --default-host aarch64-pc-windows-msvc
13+
ciCommandAddPath "${USERPROFILE}/.cargo/bin"
14+
;;
15+
esac
16+
fi

0 commit comments

Comments
 (0)