From ba137e665664221562427c4381d88ba6ad6e1e9a Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Wed, 10 Mar 2021 09:04:01 +0100
Subject: GitHub Actions: Bump os-specific-run version to 1.0.4, remove
 workaround

The issue was fixed in https://github.com/KnicKnic/os-specific-run/commit/4ba689eab869f215ead2acdf9b56c99226392f3a.
---
 .github/workflows/build.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d75029..87e5129 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
       matrix:
@@ -14,7 +14,7 @@ jobs:
           key: 'vcpkg-${{matrix.os}}'
           path: 'C:/vcpkg/installed'
 
-    - uses: knicknic/os-specific-run@v1.0.3
+    - uses: knicknic/os-specific-run@v1.0.4
       name: Install dependencies
       with:
         linux: sudo apt-get -y install ninja-build zlib1g-dev
@@ -25,14 +25,17 @@ jobs:
       with:
         submodules: 'recursive'
 
-    # Workaround for https://github.com/KnicKnic/os-specific-run/issues/9
-    - name: Build
-      run: |
-        if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "macOS" ]; then
+    - uses: knicknic/os-specific-run@v1.0.4
+      name: Build
+      with:
+        linux: |
+          mkdir ${{runner.workspace}}/build && cd ${{runner.workspace}}/build
+          cmake -G Ninja ${{github.workspace}}
+          cmake --build .
+        macos: |
           mkdir ${{runner.workspace}}/build && cd ${{runner.workspace}}/build
           cmake -G Ninja ${{github.workspace}}
           cmake --build .
-        elif [ "$RUNNER_OS" == "Windows" ]; then
-          $COMSPEC /c ${GITHUB_WORKSPACE}/.github/workflows/windows_build.bat
-        fi
-      shell: bash
+        windows:
+          ${{github.workspace}}/.github/workflows/windows_build.bat
+        windowsShell: cmd
-- 
cgit v1.2.3