Skip to content

Commit e98d26d

Browse files
committed
Fix consistency
1 parent 05dc82f commit e98d26d

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ jobs:
9191
with:
9292
key: macos-legacy
9393

94-
- name: Create Build Environment
95-
run: cmake -E make_directory ${{github.workspace}}/build
96-
9794
- name: Configure CMake
98-
working-directory: ${{github.workspace}}/build
99-
run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DNANOVG_METAL_IMPLEMENTATION=0 -DMACOS_LEGACY=1
95+
working-directory: ${{github.workspace}}
96+
run: cmake -Bbuild -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DNANOVG_METAL_IMPLEMENTATION=0 -DMACOS_LEGACY=1
10097

10198
- name: Check for Code-Signing secrets
10299
id: secret-check
@@ -116,8 +113,8 @@ jobs:
116113
p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
117114

118115
- name: Build
119-
working-directory: ${{github.workspace}}/build
120-
run: cmake --build . --config $BUILD_TYPE
116+
working-directory: ${{github.workspace}}
117+
run: cmake --build build --config $BUILD_TYPE
121118

122119
- name: Creating Installer
123120
working-directory: ${{github.workspace}}
@@ -430,11 +427,11 @@ jobs:
430427

431428
- name: Configure
432429
working-directory: ${{github.workspace}}
433-
run: mkdir build && cd build && CXX=g++ cmake -DNANOVG_GLES_IMPLEMENTATION=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. -G "Unix Makefiles"
430+
run: CXX=g++ cmake -Bbuild -DNANOVG_GLES_IMPLEMENTATION=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. -G "Unix Makefiles"
434431

435432
- name: Build
436-
working-directory: ${{github.workspace}}/build
437-
run: cmake --build . --config $BUILD_TYPE
433+
working-directory: ${{github.workspace}}
434+
run: cmake --build build --config $BUILD_TYPE
438435

439436
- name: Prepare Artefacts
440437
working-directory: ${{github.workspace}}

0 commit comments

Comments
 (0)