Skip to content

Commit 2f6b104

Browse files
committed
[libcxx] Run tests on Windows/arm64 too
Github Actions has got free runners with Windows on ARM64 these days, which can be used for running CI, just as well as the other existing cases. This qualifies this configuration as a supported target platform, thus add it to the docs in the listing of supported platforms.
1 parent f5dc553 commit 2f6b104

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/libcxx-build-and-test.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ jobs:
236236
**/crash_diagnostics/*
237237
238238
windows:
239-
runs-on: windows-2022
240239
needs: [ stage2 ]
241240
strategy:
242241
fail-fast: false
@@ -251,6 +250,8 @@ jobs:
251250
- { config: mingw-static, mingw: true }
252251
- { config: mingw-dll-i686, mingw: true }
253252
- { config: mingw-incomplete-sysroot, mingw: true }
253+
- { config: mingw-static-aarch64, mingw: true, runner: windows-11-arm }
254+
runs-on: ${{ matrix.runner != '' && matrix.runner || 'windows-latest' }}
254255
steps:
255256
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
256257
- name: Install dependencies
@@ -264,7 +265,7 @@ jobs:
264265
- name: Install llvm-mingw
265266
if: ${{ matrix.mingw == true }}
266267
run: |
267-
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-x86_64.zip
268+
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-${{ matrix.runner == 'windows-11-arm' && 'aarch64' || 'x86_64' }}.zip
268269
powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
269270
del llvm-mingw*.zip
270271
mv llvm-mingw* c:\llvm-mingw

libcxx/docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ macOS 10.13+ i386, x86_64, arm64
147147
FreeBSD 12+ i386, x86_64, arm
148148
Linux i386, x86_64, arm, arm64 Only glibc-2.24 and later and no other libc is officially supported
149149
Android 5.0+ i386, x86_64, arm, arm64
150-
Windows i386, x86_64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
150+
Windows i386, x86_64, arm64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
151151
AIX 7.2TL5+ powerpc, powerpc64
152152
Embedded (picolibc) arm
153153
===================== ========================= ============================

libcxx/utils/ci/run-buildbot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ mingw-dll)
706706
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake"
707707
check-runtimes
708708
;;
709-
mingw-static)
709+
mingw-static|mingw-static-aarch64)
710710
clean
711711
generate-cmake \
712712
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" \

0 commit comments

Comments
 (0)