[libcxx] Run tests on Windows/arm64 too #161906
Merged
+4
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
llvmbot
added
libc++
|
@llvm/pr-subscribers-github-workflow Author: Martin Storsjö (mstorsjo) ChangesGithub 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. Full diff: https://github.com/llvm/llvm-project/pull/161906.diff 3 Files Affected:
diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 77f79a85a0a2f..b322c96d63416 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -236,7 +236,6 @@ jobs:
**/crash_diagnostics/*
windows:
- runs-on: windows-2022
needs: [ stage2 ]
strategy:
fail-fast: false
@@ -251,6 +250,8 @@ jobs:
- { config: mingw-static, mingw: true }
- { config: mingw-dll-i686, mingw: true }
- { config: mingw-incomplete-sysroot, mingw: true }
+ - { config: mingw-static-aarch64, mingw: true, runner: windows-11-arm }
+ runs-on: ${{ matrix.runner != '' && matrix.runner || 'windows-latest' }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Install dependencies
@@ -264,7 +265,7 @@ jobs:
- name: Install llvm-mingw
if: ${{ matrix.mingw == true }}
run: |
- curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-x86_64.zip
+ curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-${{ matrix.runner == 'windows-11-arm' && 'aarch64' || 'x86_64' }}.zip
powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
del llvm-mingw*.zip
mv llvm-mingw* c:\llvm-mingw
diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
index 4d5064bfd7f3b..495ccceb31cef 100644
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -147,7 +147,7 @@ macOS 10.13+ i386, x86_64, arm64
FreeBSD 12+ i386, x86_64, arm
Linux i386, x86_64, arm, arm64 Only glibc-2.24 and later and no other libc is officially supported
Android 5.0+ i386, x86_64, arm, arm64
-Windows i386, x86_64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
+Windows i386, x86_64, arm64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
AIX 7.2TL5+ powerpc, powerpc64
Embedded (picolibc) arm
===================== ========================= ============================
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 57ecf1e49dbf2..b3dc428724c58 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -706,7 +706,7 @@ mingw-dll)
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake"
check-runtimes
;;
-mingw-static)
+mingw-static|mingw-static-aarch64)
clean
generate-cmake \
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" \
|
|
@llvm/pr-subscribers-libcxx Author: Martin Storsjö (mstorsjo) ChangesGithub 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. Full diff: https://github.com/llvm/llvm-project/pull/161906.diff 3 Files Affected:
diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 77f79a85a0a2f..b322c96d63416 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -236,7 +236,6 @@ jobs:
**/crash_diagnostics/*
windows:
- runs-on: windows-2022
needs: [ stage2 ]
strategy:
fail-fast: false
@@ -251,6 +250,8 @@ jobs:
- { config: mingw-static, mingw: true }
- { config: mingw-dll-i686, mingw: true }
- { config: mingw-incomplete-sysroot, mingw: true }
+ - { config: mingw-static-aarch64, mingw: true, runner: windows-11-arm }
+ runs-on: ${{ matrix.runner != '' && matrix.runner || 'windows-latest' }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Install dependencies
@@ -264,7 +265,7 @@ jobs:
- name: Install llvm-mingw
if: ${{ matrix.mingw == true }}
run: |
- curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-x86_64.zip
+ curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250709/llvm-mingw-20250709-ucrt-${{ matrix.runner == 'windows-11-arm' && 'aarch64' || 'x86_64' }}.zip
powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
del llvm-mingw*.zip
mv llvm-mingw* c:\llvm-mingw
diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
index 4d5064bfd7f3b..495ccceb31cef 100644
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -147,7 +147,7 @@ macOS 10.13+ i386, x86_64, arm64
FreeBSD 12+ i386, x86_64, arm
Linux i386, x86_64, arm, arm64 Only glibc-2.24 and later and no other libc is officially supported
Android 5.0+ i386, x86_64, arm, arm64
-Windows i386, x86_64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
+Windows i386, x86_64, arm64 Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
AIX 7.2TL5+ powerpc, powerpc64
Embedded (picolibc) arm
===================== ========================= ============================
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 57ecf1e49dbf2..b3dc428724c58 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -706,7 +706,7 @@ mingw-dll)
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake"
check-runtimes
;;
-mingw-static)
+mingw-static|mingw-static-aarch64)
clean
generate-cmake \
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" \
|
philnik777
reviewed
Oct 6, 2025
libcxx/utils/ci/run-buildbot
Outdated
| check-runtimes | ||
| ;; | ||
| mingw-static) | ||
| mingw-static|mingw-static-aarch64) |
There was a problem hiding this comment.
Why do we need a new configuration name if it is identical?
There was a problem hiding this comment.
Right - as we don't need any differences here I guess we could just reuse the same config name here as well. I'll update the PR accordingly.
|
In general I'm happy with this, but I don't really know the GH CI stuff. Maybe @boomanaiden154 could take a look at that. |
Also fix the default runner image name, don't use "windows-latest" but keep using "windows-2022" like we did before.
philnik777
approved these changes
Oct 6, 2025
boomanaiden154
approved these changes
Oct 6, 2025
|
It's a bit annoying that there are no supported Windows Server SKUs on ARM to keep everything consistent, but that seems to mostly involve waiting on Microsoft to release one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.