Skip to content

Commit

Permalink
ci: use vcpkg for both builds
Browse files Browse the repository at this point in the history
The default image of Github Actions only has a dynamic libzstd installed. It did work on my local machine, so it should still be supported, but unifying it to use vcpkg for both builds should solve this issue.
  • Loading branch information
Crementif authored Jul 21, 2024
1 parent 4c9cb3e commit b467f7a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build ZArchive

on:
push:
branches: [ $default-branch ]
branches: [ master ]
pull_request:

jobs:
Expand Down Expand Up @@ -60,6 +60,7 @@ jobs:
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake
-DBUILD_STATIC_TOOL=ON
-S ${{ github.workspace }}
Expand All @@ -72,8 +73,8 @@ jobs:
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DBUILD_STATIC_TOOL=ON
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-DBUILD_STATIC_TOOL=ON
-S ${{ github.workspace }}
- name: Build
Expand All @@ -91,4 +92,4 @@ jobs:
with:
name: zarchive-build-${{matrix.os}}-${{matrix.build_type}}-${{matrix.c_compiler}}
path: ${{ steps.strings.outputs.build-output-dir }}


0 comments on commit b467f7a

Please sign in to comment.