|
22 | 22 | with: |
23 | 23 | key: macos |
24 | 24 |
|
25 | | - - name: Create Build Environment |
26 | | - run: cmake -E make_directory ${{github.workspace}}/build |
27 | | - |
28 | 25 | - 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 |
31 | 28 |
|
32 | 29 | - name: Check for Code-Signing secrets |
33 | 30 | id: secret-check |
|
47 | 44 | p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} |
48 | 45 |
|
49 | 46 | - 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 |
52 | 49 |
|
53 | 50 | - name: Creating Installer |
54 | 51 | working-directory: ${{github.workspace}} |
|
99 | 96 |
|
100 | 97 | - name: Configure CMake |
101 | 98 | 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 |
103 | 100 |
|
104 | 101 | - name: Check for Code-Signing secrets |
105 | 102 | id: secret-check |
@@ -336,11 +333,11 @@ jobs: |
336 | 333 |
|
337 | 334 | - name: Configure |
338 | 335 | 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 |
340 | 337 |
|
341 | 338 | - 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 |
344 | 341 |
|
345 | 342 | - name: Prepare Artefacts |
346 | 343 | working-directory: ${{github.workspace}} |
|
0 commit comments