Skip to content

Commit ef757c2

Browse files
committed
Use Ninja for all builds
1 parent 0f00d34 commit ef757c2

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

.github/workflows/cmake.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ jobs:
2222
with:
2323
key: macos
2424

25-
- name: Create Build Environment
26-
run: cmake -E make_directory ${{github.workspace}}/build
27-
2825
- name: Configure CMake
29-
working-directory: ${{github.workspace}}/build
30-
run: cmake $GITHUB_WORKSPACE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
26+
working-directory: ${{github.workspace}}
27+
run: cmake -Bbuild -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
3128

3229
- name: Check for Code-Signing secrets
3330
id: secret-check
@@ -47,8 +44,8 @@ jobs:
4744
p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
4845

4946
- name: Build
50-
working-directory: ${{github.workspace}}/build
51-
run: cmake --build . --config $BUILD_TYPE
47+
working-directory: ${{github.workspace}}
48+
run: cmake --build build --config $BUILD_TYPE
5249

5350
- name: Creating Installer
5451
working-directory: ${{github.workspace}}
@@ -99,7 +96,7 @@ jobs:
9996

10097
- name: Configure CMake
10198
working-directory: ${{github.workspace}}/build
102-
run: cmake $GITHUB_WORKSPACE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DNANOVG_METAL_IMPLEMENTATION=0 -DMACOS_LEGACY=1
99+
run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DNANOVG_METAL_IMPLEMENTATION=0 -DMACOS_LEGACY=1
103100

104101
- name: Check for Code-Signing secrets
105102
id: secret-check
@@ -336,11 +333,11 @@ jobs:
336333

337334
- name: Configure
338335
working-directory: ${{github.workspace}}
339-
run: mkdir build && cd build && CXX=g++ cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. -G "Unix Makefiles"
336+
run: CXX=g++ cmake -Bbuild -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
340337

341338
- name: Build
342-
working-directory: ${{github.workspace}}/build
343-
run: cmake --build . --config $BUILD_TYPE
339+
working-directory: ${{github.workspace}}
340+
run: cmake --build build --config $BUILD_TYPE
344341

345342
- name: Prepare Artefacts
346343
working-directory: ${{github.workspace}}

0 commit comments

Comments
 (0)