Skip to content

Commit

Permalink
[brief] Fixes the build types for Linux.
Browse files Browse the repository at this point in the history
[detailed]
- Also fixes the cache for MSVC so dependencies are built in both debug
  and release.
  • Loading branch information
marovira committed Jun 26, 2024
1 parent 967b7af commit 2462e91
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2462e91

Please sign in to comment.