Update ci workflows

This commit is contained in:
ado 2023-08-07 16:05:51 +02:00
parent 41c4bf9d35
commit dcf7e924ad
2 changed files with 8 additions and 8 deletions

View File

@ -31,7 +31,7 @@ jobs:
matrix: matrix:
os: [windows-2019, windows-latest] os: [windows-2019, windows-latest]
type: [Release, Debug] type: [Release, Debug]
include: config:
- msystem: "MINGW64" - msystem: "MINGW64"
install: >- install: >-
git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
@ -44,7 +44,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
env: env:
CMAKE_GENERATOR: Ninja CMAKE_GENERATOR: Ninja
@ -56,8 +56,8 @@ jobs:
with: with:
update: true update: true
msystem: ${{matrix.msystem}} msystem: ${{matrix.config.msystem}}
install: ${{matrix.install}} install: ${{matrix.config.install}}
- name: Install dependencies - name: Install dependencies
run: script/ci_install_deps.sh run: script/ci_install_deps.sh

View File

@ -31,7 +31,7 @@ jobs:
matrix: matrix:
os: [windows-2019, windows-latest] os: [windows-2019, windows-latest]
type: [Release, Debug] type: [Release, Debug]
include: config:
- msystem: "MINGW64" - msystem: "MINGW64"
install: >- install: >-
git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
@ -44,7 +44,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
env: env:
CMAKE_GENERATOR: Ninja CMAKE_GENERATOR: Ninja
@ -55,8 +55,8 @@ jobs:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
update: true update: true
msystem: ${{matrix.msystem}} msystem: ${{matrix.config.msystem}}
install: ${{matrix.install}} install: ${{matrix.config.install}}
- name: Install dependencies - name: Install dependencies
run: script/ci_install_deps.sh run: script/ci_install_deps.sh