Fix Windows CI by using ninja

krzmaz · Oct 11, 2023 · e760d05 · e760d05
1 parent 3727cb2
commit e760d05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,13 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: carlosperate/arm-none-eabi-gcc-action@v1
+      - uses: actions/checkout@v2
+      - uses: carlosperate/arm-none-eabi-gcc-action@v1
+      - if: runner.os == 'Windows'
+        run: |
+          choco install ninja
 
-    - name: Build
-      shell: bash
-      run: |
-        ./build.sh
+      - name: Build
+        shell: bash
+        run: |
+          ./build.sh
diff --git a/build.sh b/build.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 if which ninja >/dev/null; then
-    cmake -B build -G Ninja $1 && \
+    cmake -B build -G Ninja && \
     ninja -C build $1
 else
-    cmake -B build $1 && \
+    cmake -B build && \
     make -j $(getconf _NPROCESSORS_ONLN) -C build $1 && \
     echo "done. P.S.: Consider installing ninja - it's faster"
 fi