From 7b808bbc10a8ea286372eba78b3cdfec768b309c Mon Sep 17 00:00:00 2001 From: FrogTheFrog Date: Sat, 11 May 2024 20:37:13 +0300 Subject: [PATCH] feat: migrate CI (win) to UCRT64 and use debug build for coverage --- .github/workflows/ci.yml | 13 ++++++------- README.rst | 17 +++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57eea1f..58d84ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,14 +55,13 @@ jobs: if: runner.os == 'Windows' uses: msys2/setup-msys2@v2 with: + msystem: ucrt64 update: true install: >- - base-devel - make - mingw-w64-x86_64-binutils - mingw-w64-x86_64-cmake - mingw-w64-x86_64-ninja - mingw-w64-x86_64-toolchain + mingw-w64-ucrt-x86_64-binutils + mingw-w64-ucrt-x86_64-cmake + mingw-w64-ucrt-x86_64-ninja + mingw-w64-ucrt-x86_64-toolchain - name: Prepare tests id: prepare-tests @@ -142,7 +141,7 @@ jobs: run: | mkdir -p build cd build - cmake -G Ninja .. + cmake -DCMAKE_BUILD_TYPE:STRING=Debug -G Ninja .. ninja - name: Run tests diff --git a/README.rst b/README.rst index c2cfa54..1ee209c 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ Windows Requirements ~~~~~~~~~~~~ -First you need to install `MSYS2 `__, then startup "MSYS2 MinGW 64-bit" and execute the following +First you need to install `MSYS2 `__, then startup "MSYS2 UCRT64" and execute the following codes. Update all packages: @@ -52,13 +52,10 @@ Install dependencies: .. code-block:: bash pacman -S \ - base-devel \ - cmake \ - gcc \ - make \ - mingw-w64-x86_64-binutils \ - mingw-w64-x86_64-cmake \ - mingw-w64-x86_64-toolchain + mingw-w64-ucrt-x86_64-binutils \ + mingw-w64-ucrt-x86_64-cmake \ + mingw-w64-ucrt-x86_64-ninja \ + mingw-w64-ucrt-x86_64-toolchain Build ~~~~~ @@ -67,8 +64,8 @@ Build .. code-block:: bash - cmake -G "MinGW Makefiles" .. - mingw32-make -j$(nproc) + cmake -DCMAKE_BUILD_TYPE:STRING=Debug -G Ninja .. + ninja Test ~~~~