Skip to content

Commit 8fcca28

Browse files
committed
ci: Test AArch64 Windows
1 parent a27ef18 commit 8fcca28

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
bash: msys64
8383
- os: windows-2025
8484
bash: cygwin
85+
- os: windows-11-arm
8586
- os: windows-2022
8687
tool: major.minor.patch
8788
- os: windows-2022
@@ -139,7 +140,7 @@ jobs:
139140
if [[ "$(cargo binstall -V)" != "$(jq -r '.latest.version' manifests/cargo-binstall.json)" ]]; then
140141
exit 1
141142
fi
142-
if: matrix.bash != 'cygwin'
143+
if: matrix.bash != 'cygwin' && matrix.os != 'windows-11-arm'
143144
144145
test-container:
145146
strategy:

main.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,10 @@ case "$(uname -m)" in
538538
# https://github.com/actions/runner/blob/v2.321.0/.github/workflows/build.yml#L21
539539
# https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#supported-architectures-and-operating-systems-for-self-hosted-runners
540540
# So we can assume x86_64 unless it is AArch64 or Arm.
541-
*) host_arch=x86_64 ;;
541+
*)
542+
# TODO: uname -m on windows-11-arm returns "x86_64"
543+
host_arch=x86_64
544+
;;
542545
esac
543546
info "host platform: ${host_arch}_${host_os}"
544547

tools/ci/tool-list.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ esac
124124
case "$(uname -m)" in
125125
aarch64 | arm64) host_arch=aarch64 ;;
126126
xscale | arm | armv*l) bail "32-bit Arm runner is not supported yet by this action; if you need support for this platform, please submit an issue at <https://github.com/taiki-e/install-action>" ;;
127-
*) host_arch=x86_64 ;;
127+
*)
128+
# TODO: uname -m on windows-11-arm returns "x86_64"
129+
host_arch=x86_64
130+
;;
128131
esac
129132

130133
tools=()

0 commit comments

Comments
 (0)