Skip to content

Commit aafa0ce

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

File tree

9 files changed

+30
-6
lines changed

9 files changed

+30
-6
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

+2-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
@@ -108,6 +108,7 @@ pr:
108108
env:
109109
RUST_CONFIGURE_ARGS: --build=aarch64-pc-windows-msvc
110110
SCRIPT: make ci-msvc
111+
SCCACHE_S3_NO_CREDENTIALS: 1
111112
<<: *job-windows-aarch64
112113

113114
# Jobs that run when you perform a try build (@bors try)

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 "$(cygpath -m "$(pwd)/clang-rust/bin")"
6872
fi
6973

7074
if isWindows; then

src/ci/scripts/install-mingw.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ if isWindows && isKnownToBeMingwBuild; then
4242

4343
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
4444
7z x -y mingw.7z > /dev/null
45-
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
45+
ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
4646
fi

src/ci/scripts/install-ninja.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if isWindows; then
1212
7z x -oninja ninja.zip
1313
rm ninja.zip
1414
ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja"
15-
ciCommandAddPath "$(pwd)/ninja"
15+
ciCommandAddPath "$(cygpath -m "$(pwd)/ninja")"
1616
elif isMacOS; then
1717
brew install ninja
1818
fi

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

src/ci/scripts/install-sccache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ elif isWindows; then
1515
mkdir -p sccache
1616
curl -fo sccache/sccache.exe \
1717
"${MIRRORS_BASE}/2025-02-24-sccache-v0.10.0-x86_64-pc-windows-msvc.exe"
18-
ciCommandAddPath "$(pwd)/sccache"
18+
ciCommandAddPath "$(cygpath -m "$(pwd)/sccache")"
1919
fi
2020

2121
# FIXME: we should probably install sccache outside the containers and then

src/doc/nomicon

0 commit comments

Comments
 (0)