Skip to content

Commit

Permalink
GitHub Actions: Bump os-specific-run version to 1.0.4, remove workaround
Browse files Browse the repository at this point in the history
The issue was fixed in KnicKnic/os-specific-run@4ba689e.
  • Loading branch information
davidebeatrici committed Mar 10, 2021
1 parent b7f5d8d commit ba137e6
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ on: [push, pull_request]

jobs:
build:
runs-on: ${{ matrix.os }}
runs-on: ${{matrix.os}}
strategy:
fail-fast: false
matrix:
Expand All @@ -14,7 +14,7 @@ jobs:
key: 'vcpkg-${{matrix.os}}'
path: 'C:/vcpkg/installed'

- uses: knicknic/[email protected].3
- uses: knicknic/[email protected].4
name: Install dependencies
with:
linux: sudo apt-get -y install ninja-build zlib1g-dev
Expand All @@ -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/[email protected]
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

0 comments on commit ba137e6

Please sign in to comment.