Skip to content

Commit 875fed3

Browse files
committed
github: test Ninja builds.
1 parent a138af5 commit 875fed3

File tree

1 file changed

+39
-9
lines changed

1 file changed

+39
-9
lines changed

.github/workflows/main.yml

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ on:
1616
jobs:
1717
build-linux:
1818
runs-on: ubuntu-latest
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
generator: ["Unix Makefiles", Ninja]
24+
1925
steps:
2026
# Install latest CMake.
2127
- uses: lukka/get-cmake@latest
@@ -30,7 +36,7 @@ jobs:
3036
- name: CMake
3137
run: |
3238
mkdir cbuild
33-
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE
39+
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "${{ matrix.generator }}"
3440
cmake --build cbuild/
3541
3642
- uses: ruby/setup-ruby@v1
@@ -56,6 +62,12 @@ jobs:
5662
build-windows:
5763
# Because we want to use Visual Studio 16 2019, we need to use the windows-2019 GitHub runner
5864
runs-on: windows-2019
65+
66+
strategy:
67+
fail-fast: false
68+
matrix:
69+
generator: ["Visual Studio 16 2019", Ninja]
70+
5971
steps:
6072
# Install latest CMake.
6173
- uses: lukka/get-cmake@latest
@@ -64,15 +76,32 @@ jobs:
6476
with:
6577
submodules: recursive
6678

67-
- name: CMake
68-
run: |
69-
# make a build directory (note: build is already used by Crashpad)
70-
mkdir cbuild
79+
# - name: Setup Ninja
80+
# uses: ashutoshvarma/setup-ninja@master
81+
# with:
82+
# version: 1.10.0
7183

72-
# run CMake (additional options like -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE are possible)
73-
# it is recommended to specify the compiler version used for the build
74-
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "Visual Studio 16 2019"
75-
cmake --build cbuild/
84+
- name: Build with CMake
85+
uses: ashutoshvarma/action-cmake-build@master
86+
with:
87+
build-dir: ${{ runner.workspace }}/cbuild
88+
cc: cl
89+
cxx: cl
90+
configure-options: -G \\"${{ matrix.generator }}\\"
91+
build-type: Debug
92+
93+
94+
95+
# - name: CMake
96+
# run: |
97+
# # make a build directory (note: build is already used by Crashpad)
98+
# mkdir cbuild
99+
100+
# # run CMake (additional options like -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE are possible)
101+
# # it is recommended to specify the compiler version used for the build
102+
# "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
103+
# cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "${{ matrix.generator }}"
104+
# cmake --build cbuild/
76105

77106
- uses: ruby/setup-ruby@v1
78107
with:
@@ -101,6 +130,7 @@ jobs:
101130
fail-fast: false
102131
matrix:
103132
arch: [arm64, x86_64]
133+
# generator: ["Unix Makefiles", Ninja]
104134

105135
steps:
106136
# Install latest CMake.

0 commit comments

Comments
 (0)