Skip to content

Commit e918bf6

Browse files
authored
feat: migrate CI (win) to UCRT64 and use debug build for coverage (#33)
1 parent d6c21b1 commit e918bf6

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@ jobs:
5555
if: runner.os == 'Windows'
5656
uses: msys2/setup-msys2@v2
5757
with:
58+
msystem: ucrt64
5859
update: true
5960
install: >-
60-
base-devel
61-
make
62-
mingw-w64-x86_64-binutils
63-
mingw-w64-x86_64-cmake
64-
mingw-w64-x86_64-ninja
65-
mingw-w64-x86_64-toolchain
61+
mingw-w64-ucrt-x86_64-binutils
62+
mingw-w64-ucrt-x86_64-cmake
63+
mingw-w64-ucrt-x86_64-ninja
64+
mingw-w64-ucrt-x86_64-toolchain
6665
6766
- name: Prepare tests
6867
id: prepare-tests
@@ -142,7 +141,7 @@ jobs:
142141
run: |
143142
mkdir -p build
144143
cd build
145-
cmake -G Ninja ..
144+
cmake -DCMAKE_BUILD_TYPE:STRING=Debug -G Ninja ..
146145
ninja
147146
148147
- name: Run tests

README.rst

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Windows
4040
Requirements
4141
~~~~~~~~~~~~
4242

43-
First you need to install `MSYS2 <https://www.msys2.org>`__, then startup "MSYS2 MinGW 64-bit" and execute the following
43+
First you need to install `MSYS2 <https://www.msys2.org>`__, then startup "MSYS2 UCRT64" and execute the following
4444
codes.
4545

4646
Update all packages:
@@ -52,13 +52,10 @@ Install dependencies:
5252
.. code-block:: bash
5353
5454
pacman -S \
55-
base-devel \
56-
cmake \
57-
gcc \
58-
make \
59-
mingw-w64-x86_64-binutils \
60-
mingw-w64-x86_64-cmake \
61-
mingw-w64-x86_64-toolchain
55+
mingw-w64-ucrt-x86_64-binutils \
56+
mingw-w64-ucrt-x86_64-cmake \
57+
mingw-w64-ucrt-x86_64-ninja \
58+
mingw-w64-ucrt-x86_64-toolchain
6259
6360
Build
6461
~~~~~
@@ -67,8 +64,8 @@ Build
6764

6865
.. code-block:: bash
6966
70-
cmake -G "MinGW Makefiles" ..
71-
mingw32-make -j$(nproc)
67+
cmake -DCMAKE_BUILD_TYPE:STRING=Debug -G Ninja ..
68+
ninja
7269
7370
Test
7471
~~~~

0 commit comments

Comments
 (0)