From 67d2a05edbb3c17c6893e10e270f2dcf8bfa03bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Tue, 10 Jun 2025 13:31:42 +0300 Subject: [PATCH] ci: Extend the msys2 testing to the "clangarm64" environment The clangarm64 msys environment doesn't have a "gcc" command by default, unless the "gcc-compat" package is installed. One may consider using "cc" as well, which is available when the "toolchain" package is installed in each environment, but that tool in clang environments fails the "direct" test case. --- .github/workflows/build.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f012c24d..cb2c2649 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -167,17 +167,23 @@ jobs: build_and_test_msys: timeout-minutes: 30 - runs-on: windows-2025 + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: include: - sys: mingw64 compiler: gcc + os: windows-2025 - sys: mingw64 compiler: clang extra_cmake_params: -DENABLE_TESTING=OFF # clang currently triggers warnings with doctest + os: windows-2025 + + - sys: clangarm64 + compiler: clang + os: windows-11-arm name: 'Windows MSYS2 ${{ matrix.sys }} ${{ matrix.compiler }}' defaults: @@ -223,7 +229,7 @@ jobs: steps.build-and-test.outputs.exit_status == 8 }} env: CMAKE_GENERATOR: Ninja - TEST_CC: gcc + TEST_CC: ${{ matrix.compiler }} - name: Collect testdir from failed tests if: failure() -- 2.47.3