final fixup

f3d-app · Aug 28, 2024 · 5614b81 · 5614b81
1 parent 4d67b3d
commit 5614b81
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,14 +53,24 @@ jobs:
       with:
         key: MyKey-0
 
-    - name: Configure and build HelloWorld
+    - name: Setup directories
       working-directory: ${{github.workspace}}/HelloWorld
       shell: bash
-      run: |
-        mkdir build
-        cd build
-        cmake -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache ../
-        cmake --build .
+      run: mkdir build
+
+    - name: Configure
+      working-directory: ${{github.workspace}}/HelloWorld/build
+      shell: bash
+      run: >
+        cmake ../
+        -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+        -DCMAKE_C_COMPILER_LAUNCHER=sccache
+        ${{ runner.os == 'Windows' && '-G Ninja' || null }}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/HelloWorld/build
+      shell: bash
+      run: cmake --build .
 
     - name: Show and check sccache
       shell: bash

diff --git a/README.md b/README.md
@@ -16,8 +16,6 @@ Example usage:
       key: MyKey-0
 ```
 
-
-
 Then during the configuration of your build, add sccache as a launcher, eg, for CMake:
 
 ```
@@ -39,3 +37,6 @@ To check the sccache action is behaving as expected, it is possible to add the f
     shell: bash
     run: sccache --show-stats
 ```
+
+Please note sccache does not work with Visual Studio Generator on Windows but requires ninja-build in that case:
+https://github.com/mozilla/sccache/issues/957