Skip to content

Commit 33f9a14

Browse files
committed
[.github/workflows/github-actions.yml] Use vcpkg on non Windows also
1 parent a04ffa4 commit 33f9a14

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/github-actions.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,26 @@ jobs:
3535
with:
3636
path: vcpkg
3737
key: ${{ runner.os }}-${{ hashFiles('**/vcpkg.json') }}-43a81834cc9d6d953bd5ca8153437ef65fed86ab
38-
if: matrix.os == 'windows-latest'
3938

4039
- name: checkout vcpkg
4140
uses: actions/checkout@v4
4241
with:
4342
repository: "offscale/vcpkg"
4443
ref: project0
4544
path: vcpkg
46-
if: matrix.os == 'windows-latest' && steps.cache-vcpkg.outputs.cache-hit != 'true'
45+
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
4746

4847
- name: Setup vcpkg (Windows)
4948
run: ./vcpkg/bootstrap-vcpkg.bat
5049
if: matrix.os == 'windows-latest'
5150

51+
- name: Setup vcpkg (non-Windows)
52+
run: ./vcpkg/bootstrap-vcpkg
53+
if: matrix.os != 'windows-latest'
54+
5255
- name: Install vcpkg ports (Windows)
53-
run: ./vcpkg/vcpkg install --triplet "${{ runner.arch }}-${{ runner.os }}" "$(jq '.dependencies[]' vcpkg.json)"
54-
if: matrix.os == 'windows-latest' && steps.cache-vcpkg.outputs.cache-hit != 'true'
56+
run: ./vcpkg/vcpkg install --triplet "${{ runner.arch }}-${{ runner.os }}" "$(jq '.dependencies[] | select(type == "string")')"
57+
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
5558

5659
- name: configure (with vcpkg on Windows)
5760
working-directory: ./build
@@ -60,9 +63,10 @@ jobs:
6063
shell: cmd
6164
if: matrix.os == 'windows-latest'
6265

63-
- name: configure (Ubuntu, macOS)
66+
- name: configure (with vcpkg on non-Windows)
6467
working-directory: ./build
65-
run: cmake -DCMAKE_BUILD_TYPE="Debug" ..
68+
run: |
69+
cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
6670
if: matrix.os != 'windows-latest'
6771

6872
- name: build

0 commit comments

Comments
 (0)