Skip to content

Commit 760091c

Browse files
committed
Use ninja build system in CMake tests on Cygin in GitHub Actions.
This is an attempt to work around CMake failure on Cygwin.
1 parent ae458c7 commit 760091c

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,14 @@ jobs:
679679
fail-fast: false
680680
matrix:
681681
include:
682-
- { sys: MINGW32, toolset: gcc, cxxstd: '11,17,20,23' }
683-
- { sys: MINGW64, toolset: gcc, cxxstd: '11,17,20,23' }
682+
- sys: MINGW32
683+
toolset: gcc
684+
cxxstd: '11,17,20,23'
685+
cmake_generator: "Ninja"
686+
- sys: MINGW64
687+
toolset: gcc
688+
cxxstd: '11,17,20,23'
689+
cmake_generator: "Ninja"
684690

685691
timeout-minutes: 30
686692
runs-on: windows-latest
@@ -768,6 +774,10 @@ jobs:
768774
# Run also the CMake tests to avoid having to setup another matrix for CMake on MSYS
769775
- name: Run CMake tests
770776
run: |
777+
if [ -n "${{matrix.cmake_generator}}" ]
778+
then
779+
export "CMAKE_GENERATOR=${{matrix.cmake_generator}}"
780+
fi
771781
[ ! -d boost-root ] || cd boost-root
772782
mkdir __build_static__ && cd __build_static__
773783
cmake -DBUILD_SHARED_LIBS=OFF ../libs/$LIBRARY/test/test_cmake
@@ -793,6 +803,7 @@ jobs:
793803
- toolset: gcc
794804
cxxstd: "14-gnu,17-gnu,20-gnu,23-gnu"
795805
build_variant: debug
806+
cmake_generator: "Ninja"
796807

797808
timeout-minutes: 30
798809
runs-on: windows-latest
@@ -808,6 +819,7 @@ jobs:
808819
packages:
809820
gcc-g++
810821
cmake
822+
ninja
811823

812824
- name: Setup Boost
813825
run: |
@@ -885,6 +897,10 @@ jobs:
885897
# Run also the CMake tests to avoid having to setup another matrix for CMake on Cygwin
886898
- name: Run CMake tests
887899
run: |
900+
if [ -n "${{matrix.cmake_generator}}" ]
901+
then
902+
export "CMAKE_GENERATOR=${{matrix.cmake_generator}}"
903+
fi
888904
[ ! -d boost-root ] || cd boost-root
889905
mkdir __build_static__ && cd __build_static__
890906
cmake -DBUILD_SHARED_LIBS=OFF ../libs/$LIBRARY/test/test_cmake

0 commit comments

Comments
 (0)