Skip to content

Commit

Permalink
cmake: simplify presets
Browse files Browse the repository at this point in the history
Remove unused and too complicated presets.
Use CC and CXX env vars to override compiler selections.
  • Loading branch information
MariusBgm committed Sep 13, 2024
1 parent 8384333 commit 06bf108
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 851 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jobs:
submodules: true
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang14-release
preset-name: release
cmake-args: "-D CMAKE_C_COMPILER=clang-14 -D CMAKE_CXX_COMPILER=clang++-14"
do-package: ${{ inputs.do_package }}
retention-days: ${{ inputs.retention_days }}

Expand All @@ -50,7 +51,7 @@ jobs:
uses: ./.github/actions/build-cmake-preset
id: build
with:
preset-name: gcc-release
preset-name: release
do-package: ${{ inputs.do_package }}
retention-days: ${{ env.retention_days }}

4 changes: 2 additions & 2 deletions .github/workflows/linux-asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
submodules: true
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang14-relwithdebinfo
cmake-args: "-D SILKIT_ENABLE_ASAN=ON -D SILKIT_BUILD_DASHBOARD=OFF"
preset-name: addresssan
cmake-args: "-D CMAKE_C_COMPILER=clang-14 -D CMAKE_CXX_COMPILER=clang++-14"
do-package: false
4 changes: 2 additions & 2 deletions .github/workflows/linux-tsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
submodules: true
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang14-relwithdebinfo
cmake-args: "-D SILKIT_ENABLE_THREADSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF"
preset-name: threadsan
cmake-args: "-D CMAKE_C_COMPILER=clang-14 -D CMAKE_CXX_COMPILER=clang++-14"
do-package: false
4 changes: 2 additions & 2 deletions .github/workflows/linux-ubsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
submodules: true
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang14-relwithdebinfo
cmake-args: "-D SILKIT_ENABLE_UBSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF"
preset-name: ubsan
cmake-args: "-D CMAKE_C_COMPILER=clang-14 -D CMAKE_CXX_COMPILER=clang++-14"
do-package: false
Loading

0 comments on commit 06bf108

Please sign in to comment.