Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 7 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Windows
Requirements
~~~~~~~~~~~~

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

Update all packages:
Expand All @@ -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
~~~~~
Expand All @@ -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
~~~~
Expand Down