From dcf7e924ad86d1b740802e122a792814c0fd63aa Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 16:05:51 +0200 Subject: [PATCH] Update ci workflows --- .github/workflows/win-msys2-clang.yml | 8 ++++---- .github/workflows/win-msys2-gcc.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 7761430..ba73261 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -31,7 +31,7 @@ jobs: matrix: os: [windows-2019, windows-latest] type: [Release, Debug] - include: + config: - msystem: "MINGW64" install: >- git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja @@ -44,7 +44,7 @@ jobs: runs-on: ${{matrix.os}} - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" env: CMAKE_GENERATOR: Ninja @@ -56,8 +56,8 @@ jobs: with: update: true - msystem: ${{matrix.msystem}} - install: ${{matrix.install}} + msystem: ${{matrix.config.msystem}} + install: ${{matrix.config.install}} - name: Install dependencies run: script/ci_install_deps.sh diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index e571e9b..cacdba0 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -31,7 +31,7 @@ jobs: matrix: os: [windows-2019, windows-latest] type: [Release, Debug] - include: + config: - msystem: "MINGW64" install: >- git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja @@ -44,7 +44,7 @@ jobs: runs-on: ${{matrix.os}} - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" env: CMAKE_GENERATOR: Ninja @@ -55,8 +55,8 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - msystem: ${{matrix.msystem}} - install: ${{matrix.install}} + msystem: ${{matrix.config.msystem}} + install: ${{matrix.config.install}} - name: Install dependencies run: script/ci_install_deps.sh