Skip to content

Commit a5830ef

Browse files
committed
ci: build on MSYS2 with UCRT, too
1 parent 0095388 commit a5830ef

File tree

1 file changed

+24
-16
lines changed

1 file changed

+24
-16
lines changed

.github/workflows/msys2.yml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@ name: MSYS2
33
on: push
44

55
jobs:
6-
msys2_mingw64:
6+
msys2:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
include:
11+
- msystem: mingw64
12+
package: x86_64
13+
- msystem: ucrt64
14+
package: ucrt-x86_64
715
runs-on: windows-2022
816
defaults:
917
run:
@@ -19,21 +27,21 @@ jobs:
1927
- name: Install MSYS2 + build dependencies
2028
uses: msys2/setup-msys2@v2
2129
with:
22-
msystem: mingw64
30+
msystem: ${{matrix.msystem}}
2331
update: true
2432
install: >-
2533
git
26-
mingw-w64-x86_64-boost
27-
mingw-w64-x86_64-catch
28-
mingw-w64-x86_64-cmake
29-
mingw-w64-x86_64-gcc
30-
mingw-w64-x86_64-libxml2
31-
mingw-w64-x86_64-ninja
32-
mingw-w64-x86_64-pkg-config
33-
mingw-w64-x86_64-zlib
34+
mingw-w64-${{matrix.package}}-boost
35+
mingw-w64-${{matrix.package}}-catch
36+
mingw-w64-${{matrix.package}}-cmake
37+
mingw-w64-${{matrix.package}}-gcc
38+
mingw-w64-${{matrix.package}}-libxml2
39+
mingw-w64-${{matrix.package}}-ninja
40+
mingw-w64-${{matrix.package}}-pkg-config
41+
mingw-w64-${{matrix.package}}-zlib
3442
- name: Build
3543
run: |
36-
export MSYSTEM=MINGW64
44+
export MSYSTEM=$(echo ${{matrix.msystem}} | tr '[:lower:]' '[:upper:]')
3745
export CXX=g++
3846
export CC=gcc
3947
cd "$GITHUB_WORKSPACE"
@@ -43,12 +51,12 @@ jobs:
4351
cmake --build . -j2
4452
# - name: Tests
4553
# run: |
46-
# export MSYSTEM=MINGW64
54+
# export MSYSTEM=$(echo ${{matrix.msystem}} | tr '[:lower:]' '[:upper:]')
4755
# cd "$GITHUB_WORKSPACE"/build
4856
# ctest -V
4957
- name: Build with statically linked standard libraries
5058
run: |
51-
export MSYSTEM=MINGW64
59+
export MSYSTEM=$(echo ${{matrix.msystem}} | tr '[:lower:]' '[:upper:]')
5260
export CXX=g++
5361
export CC=gcc
5462
cd "$GITHUB_WORKSPACE"
@@ -58,12 +66,12 @@ jobs:
5866
cmake --build . -j4
5967
# - name: Tests of build with statically linked standard libraries
6068
# run: |
61-
# export MSYSTEM=MINGW64
69+
# export MSYSTEM=$(echo ${{matrix.msystem}} | tr '[:lower:]' '[:upper:]')
6270
# cd "$GITHUB_WORKSPACE"/build_static_std_libs
6371
# ctest -V
6472
- name: Gather build artifacts
6573
run: |
66-
export MSYSTEM=MINGW64
74+
export MSYSTEM=$(echo ${{matrix.msystem}} | tr '[:lower:]' '[:upper:]')
6775
cd "$GITHUB_WORKSPACE"
6876
mkdir artifacts
6977
# binary files
@@ -87,7 +95,7 @@ jobs:
8795
- name: Upload artifacts
8896
uses: actions/upload-artifact@v4
8997
with:
90-
name: pmdb-windows-msys2
98+
name: pmdb-windows-msys2-${{matrix.msystem}}
9199
if-no-files-found: error
92100
path: |
93101
pmdb*.zip

0 commit comments

Comments
 (0)