From 2462e91fc6dfd9dbd7da450c71448b2caa2e9d8d Mon Sep 17 00:00:00 2001 From: "Mauricio A. Rovira Galvez" <8482308+marovira@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:43:08 -0700 Subject: [PATCH] [brief] Fixes the build types for Linux. [detailed] - Also fixes the cache for MSVC so dependencies are built in both debug and release. --- .github/workflows/build-linux.yml | 2 +- .github/workflows/build-msvc.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 50026c4..8b51a87 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -43,7 +43,7 @@ jobs: CC: ${{ matrix.config.cc }} CXX: ${{ matrix.config.cxx }} run: | - cmake --preset=$CONFIG_TYPE --config $BUILD_TYPE -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=~/deps + cmake --preset=$CONFIG_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=~/deps cd ./build make diff --git a/.github/workflows/build-msvc.yml b/.github/workflows/build-msvc.yml index f02f50d..ae1385f 100644 --- a/.github/workflows/build-msvc.yml +++ b/.github/workflows/build-msvc.yml @@ -21,13 +21,13 @@ jobs: uses: actions/cache@v4 with: path: C:/deps - key: deps-${{ runner.os }}-${{ hashfiles('dependencies.txt') }} + key: deps-${{ runner.os }}-${{ matrix.config}}-${{ hashfiles('dependencies.txt') }} - name: Install dependencies if: steps.cache-deps.outputs.cache-hit != 'true' shell: powershell env: - BUILD_TYPE: Release + BUILD_TYPE: ${{ matrix.config }} run: ./.github/workflows/scripts/install_deps.ps1 - name: Build