From 6e6cedcd40ffa39af290936e56a1c5b88f8cd089 Mon Sep 17 00:00:00 2001 From: Avery King Date: Thu, 5 Sep 2024 14:04:47 -0700 Subject: [PATCH] CI: Allow vcpkg to be optional 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 --- .github/workflows/cmake_build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index b7a2f040d..ed9a93d0a 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -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 @@ -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" @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 }}