diff options
| author | Miloš Komarčević <4973094+kmilos@users.noreply.github.com> | 2023-03-06 20:43:00 +0100 |
|---|---|---|
| committer | Miloš Komarčević <miloskomarcevic@aim.com> | 2023-03-14 14:41:10 +0100 |
| commit | 29a6ee0bec8898908a8d88a980f2ba59e5d4763e (patch) | |
| tree | 24c541a5d5819f107e722e070f9f133ade2a1ced | |
| parent | ef21b76c33aadfe67f61e378627cd63f21aab4c1 (diff) | |
| download | lcms2-29a6ee0bec8898908a8d88a980f2ba59e5d4763e.tar.gz | |
Simplify MSYS2 CI jobs further
| -rw-r--r-- | .github/workflows/build.yml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1590df3..b1cd3a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,8 +102,8 @@ jobs: meson compile -C build meson test -C build - msys-meson: - name: 'msys-meson ${{ matrix.sys.abi }} ${{ matrix.library }}' + msys2-meson: + name: 'msys2-meson ${{ matrix.sys }} ${{ matrix.library }}' runs-on: windows-latest defaults: run: @@ -111,23 +111,24 @@ jobs: strategy: matrix: sys: - - { abi: mingw32, env: i686, compiler: gcc } - - { abi: mingw64, env: x86_64, compiler: gcc } - - { abi: ucrt64, env: ucrt-x86_64, compiler: gcc } - - { abi: clang32, env: clang-i686, compiler: clang } - - { abi: clang64, env: clang-x86_64, compiler: clang } + - mingw32 + - mingw64 + - ucrt64 + - clang32 + - clang64 library: ['shared', 'static'] fail-fast: false steps: - name: Use MinGW from MSYS uses: msys2/setup-msys2@v2 with: - msystem: ${{matrix.sys.abi}} + msystem: ${{matrix.sys}} update: true pacboy: >- - toolchain:p + cc:p meson:p ninja:p + pkgconf:p - uses: actions/checkout@v2 |