Skip to content

Commit a506d0e

Browse files
committed
WIP: Test with a custom command sequence
This should make sure to use a native aarch64 python, in case that makes any difference anywhere.
1 parent 12a6552 commit a506d0e

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,41 +225,44 @@ jobs:
225225
226226
windows:
227227
runs-on: windows-11-arm
228-
strategy:
229-
fail-fast: false
230-
matrix:
231-
include:
232-
- { config: mingw-dll, mingw: true }
233228
steps:
234229
- uses: actions/checkout@v4
235230
- name: Install dependencies
236231
run: |
237232
choco install -y ninja
238233
pip install psutil
239-
- name: Install a current LLVM
240-
if: ${{ matrix.mingw != true }}
241-
run: |
242-
choco install -y llvm --version=19.1.7 --allow-downgrade
243234
- name: Install llvm-mingw
244-
if: ${{ matrix.mingw == true }}
245235
run: |
246-
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-ucrt-aarch64.zip
236+
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250417/llvm-mingw-20250417-ucrt-aarch64.zip
247237
powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
248238
del llvm-mingw*.zip
249239
mv llvm-mingw* c:\llvm-mingw
250240
echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
251-
- name: Simulate a from-scratch build of llvm-mingw
252-
if: ${{ matrix.config == 'mingw-incomplete-sysroot' }}
253-
run: |
254-
rm -r c:\llvm-mingw\include\c++
255-
rm -r c:\llvm-mingw\*-w64-mingw32\lib\libc++*
256-
rm -r c:\llvm-mingw\*-w64-mingw32\lib\libunwind*
241+
echo "c:\llvm-mingw\python\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
242+
echo "PYTHON_EXE=c:/llvm-mingw/python/bin/python3.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
257243
- name: Add Git Bash to the path
258244
run: |
259245
echo "c:\Program Files\Git\usr\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
260-
- name: Set up the MSVC dev environment
261-
if: ${{ matrix.mingw != true }}
262-
uses: ilammy/msvc-dev-cmd@v1
263246
- name: Build and test
264247
run: |
265-
bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
248+
mkdir build
249+
cd build
250+
cmake ../runtimes `
251+
-G Ninja `
252+
-DCMAKE_BUILD_TYPE=Release `
253+
-DPython3_EXECUTABLE="$Env:PYTHON_EXE" `
254+
-DLIBCXX_ENABLE_WERROR=YES `
255+
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" `
256+
-DLIBCXX_CXX_ABI=libcxxabi `
257+
-DCMAKE_C_COMPILER=clang `
258+
-DCMAKE_CXX_COMPILER=clang++ `
259+
-DLIBCXXABI_ENABLE_SHARED=NO `
260+
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES `
261+
-DLIBCXX_USE_COMPILER_RT=YES `
262+
-DLIBCXXABI_USE_COMPILER_RT=YES `
263+
-DLIBUNWIND_USE_COMPILER_RT=YES `
264+
-DLIBCXXABI_USE_LLVM_UNWINDER=YES `
265+
-DLIBCXX_EXTRA_SITE_DEFINES="__USE_MINGW_ANSI_STDIO=1" `
266+
-DLLVM_LIT_ARGS="-v --time-tests"
267+
ninja
268+
ninja check-cxx

0 commit comments

Comments
 (0)