From a02e0a47cbcc3cac6bf01463241b0208ec654a75 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sun, 23 Jan 2022 16:38:18 -0800 Subject: [PATCH 122/N] CI: test CLANGARM64 test cross-compiled arm builds too --- .github/workflows/mingw.yml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 65d7d7d..97ecd18 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -3,20 +3,27 @@ on: [push, pull_request, workflow_dispatch] jobs: build: - runs-on: windows-2022 + runs-on: ${{ matrix.runner }} strategy: fail-fast: false matrix: - msystem: ['MINGW64','MINGW32','UCRT64','CLANG64'] + msystem: ['MINGW64','MINGW32','UCRT64','CLANG64','CLANGARM64'] include: - msystem: MINGW64 prefix: mingw-w64-x86_64 + runner: windows-2022 - msystem: MINGW32 prefix: mingw-w64-i686 + runner: windows-2022 - msystem: UCRT64 prefix: mingw-w64-ucrt-x86_64 + runner: windows-2022 - msystem: CLANG64 prefix: mingw-w64-clang-x86_64 + runner: windows-2022 + - msystem: CLANGARM64 + prefix: mingw-w64-clang-aarch64 + runner: windows-11-arm steps: - name: Setup git run: | @@ -26,7 +33,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} - release: false + release: ${{ matrix.msystem == 'CLANGARM64' }} update: true install: >- make @@ -279,11 +286,22 @@ jobs: cross-llvm-mingw-test: needs: [cross-llvm-mingw] - runs-on: windows-latest + runs-on: ${{ matrix.runner }} strategy: fail-fast: false matrix: - arch: ['x86_64', 'i686'] + arch: ['x86_64', 'i686', 'aarch64', 'armv7'] + include: + - arch: x86_64 + runner: windows-latest + - arch: i686 + runner: windows-latest + - arch: aarch64 + runner: windows-11-arm + # we can test this for now, but Windows 11 24H2 dropped support for + # arm32 + - arch: armv7 + runner: windows-11-arm steps: - uses: actions/download-artifact@v4 with: @@ -291,7 +309,9 @@ jobs: - name: 'Run tests' run: | - 7z x install.zip + if (Test-Path ./_build) {rm -r -fo ./_build} + Add-Type -AssemblyName System.IO.Compression.FileSystem ; + [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\install.zip", "$PWD") ./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())"