Skip to content

Commit a811641

Browse files
committed
Use Ninja generator in CI
1 parent 5bd5737 commit a811641

File tree

1 file changed

+45
-4
lines changed

1 file changed

+45
-4
lines changed

.github/workflows/main.yml

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: CMake
3131
run: |
3232
mkdir cbuild
33-
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE
33+
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G Ninja
3434
cmake --build cbuild/
3535
3636
- uses: ruby/setup-ruby@v1
@@ -47,7 +47,7 @@ jobs:
4747
- name: Crashpad distribution ZIP
4848
run: |
4949
ruby backtrace/save_artifacts.rb --output Crashpad_Linux_build.zip
50-
50+
5151
- uses: actions/upload-artifact@v3
5252
with:
5353
name: Crashpad_Linux_build_${{ github.sha }}
@@ -85,6 +85,47 @@ jobs:
8585
run: |
8686
bundle exec ruby ./test.rb -v
8787
88+
- name: Crashpad distribution ZIP
89+
run: |
90+
ruby backtrace/save_artifacts.rb --output Crashpad_Windows_build.zip
91+
92+
- uses: actions/upload-artifact@v3
93+
with:
94+
name: Crashpad_Windows_build_${{ github.sha }}
95+
path: Crashpad_Windows_build.zip
96+
97+
build-windows-ninja:
98+
# Because we want to use Visual Studio 16 2019, we need to use the windows-2019 GitHub runner
99+
runs-on: windows-2019
100+
steps:
101+
# Install latest CMake.
102+
- uses: lukka/get-cmake@latest
103+
104+
- uses: actions/checkout@v2
105+
with:
106+
submodules: recursive
107+
108+
- name: CMake
109+
run: |
110+
# make a build directory (note: build is already used by Crashpad)
111+
mkdir cbuild
112+
113+
# run CMake (additional options like -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE are possible)
114+
# it is recommended to specify the compiler version used for the build
115+
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G Ninja
116+
cmake --build cbuild/
117+
118+
- uses: ruby/setup-ruby@v1
119+
with:
120+
ruby-version: '3.1'
121+
working-directory: ./backtrace/test
122+
bundler-cache: true
123+
124+
- name: Run tests
125+
working-directory: ./backtrace/test
126+
run: |
127+
bundle exec ruby ./test.rb -v
128+
88129
- name: Crashpad distribution ZIP
89130
run: |
90131
ruby backtrace/save_artifacts.rb --output Crashpad_Windows_build.zip
@@ -113,7 +154,7 @@ jobs:
113154
- name: CMake
114155
run: |
115156
mkdir cbuild
116-
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
157+
cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -G Ninja
117158
cmake --build cbuild/
118159
119160
- uses: ruby/setup-ruby@v1
@@ -180,7 +221,7 @@ jobs:
180221
- name: CMake
181222
run: |
182223
mkdir cbuild
183-
cmake -S . -B cbuild/ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/${{ matrix.ndk }}/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=android-${{ matrix.apiLevel }} -DANDROID_NATIVE_API_LEVEL=${{ matrix.apiLevel }} -DANDROID_TOOLCHAIN=clang -DANDROID_SSL_MODE=${{ env.SSL_MODE }} -DBUILD_EXAMPLES=TRUE
224+
cmake -S . -B cbuild/ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/${{ matrix.ndk }}/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=android-${{ matrix.apiLevel }} -DANDROID_NATIVE_API_LEVEL=${{ matrix.apiLevel }} -DANDROID_TOOLCHAIN=clang -DANDROID_SSL_MODE=${{ env.SSL_MODE }} -DBUILD_EXAMPLES=TRUE -G Ninja
184225
cmake --build cbuild/
185226
186227
- name: Crashpad distribution ZIP

0 commit comments

Comments
 (0)