Skip to content

Commit

Permalink
CI: Allow vcpkg to be optional
Browse files Browse the repository at this point in the history
vcpkg is still used in CI, but it is now dependent on if
matrix.config.use_vcpkg is set to true or not.

Signed-off-by: Avery King <[email protected]>
  • Loading branch information
generic-pers0n committed Nov 25, 2024
1 parent e92c168 commit 6e6cedc
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/cmake_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
cxx: c++
compiler_cache: ccache
compiler_cache_path: ~/.ccache
use_vcpkg: ON
vcpkg_binary_cache: ~/.cache/vcpkg
vcpkg_triplet: x64-linux-dynamic

Expand All @@ -44,6 +45,7 @@ jobs:
cxx: c++
compiler_cache: ccache
compiler_cache_path: ~/Library/Caches/ccache
use_vcpkg: ON
vcpkg_binary_cache: ~/.cache/vcpkg
vcpkg_triplet: x64-osx-dynamic
additional_cmake_flags: -DCMAKE_APPLE_SILICON_PROCESSOR="x86_64"
Expand All @@ -56,6 +58,7 @@ jobs:
cxx: c++
compiler_cache: ccache
compiler_cache_path: ~/Library/Caches/ccache
use_vcpkg: ON
vcpkg_binary_cache: ~/.cache/vcpkg
vcpkg_triplet: arm64-osx-dynamic

Expand All @@ -70,6 +73,7 @@ jobs:
cxx: cl
compiler_cache: sccache
compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
use_vcpkg: ON
vcpkg_binary_cache: C:\Users\runneradmin\AppData\Local\vcpkg
vcpkg_triplet: x86-windows
exe_suffix: .exe
Expand All @@ -85,6 +89,7 @@ jobs:
cxx: cl
compiler_cache: sccache
compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
use_vcpkg: ON
vcpkg_binary_cache: C:\Users\runneradmin\AppData\Local\vcpkg
vcpkg_triplet: x64-windows
exe_suffix: .exe
Expand All @@ -100,6 +105,7 @@ jobs:
additional_cmake_flags: -A ARM64
compiler_cache: sccache
compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
use_vcpkg: ON
vcpkg_binary_cache: C:\Users\runneradmin\AppData\Local\vcpkg
vcpkg_triplet: arm64-windows
exe_suffix: .exe
Expand Down Expand Up @@ -181,7 +187,7 @@ jobs:
-G "${{ matrix.config.generator }}"
-D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }}
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install
-D VCPKG=ON
-D VCPKG=${{ matrix.config.use_vcpkg }}
-D SBSMS=ON
-S .
-B build
Expand Down Expand Up @@ -230,7 +236,6 @@ jobs:
if-no-files-found: error

- name: Upload artifact of vcpkg build logs
if: always()
uses: actions/upload-artifact@v4
with:
name: vcpkg-logs-${{ runner.os }}-${{ matrix.config.arch }}
Expand Down

0 comments on commit 6e6cedc

Please sign in to comment.