From 3241543b37a6908c8c626018ab7e942749081673 Mon Sep 17 00:00:00 2001 From: Jan Kraemer Date: Mon, 16 Sep 2024 14:00:27 +0200 Subject: [PATCH] fixup! fixup! fixup! fixup! ci: Use presets action but override compiler --- .github/workflows/build-linux-arm64.yml | 1 + .github/workflows/build-linux.yml | 1 + .github/workflows/linux-asan.yml | 2 +- .github/workflows/linux-tsan.yml | 2 +- .github/workflows/linux-ubsan.yml | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index c73c92234..f716dd005 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -37,6 +37,7 @@ jobs: submodules: true - uses: ./.github/actions/build-cmake-preset with: + preset-name: clang-relwithdebinfo do-package: ${{ inputs.do_package }} retention-days: ${{ inputs.retention_days }} cmake-args: "-DCMAKE_BUILD_TYPE=Release \ diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index f25881853..213f460a2 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -39,6 +39,7 @@ jobs: submodules: true - uses: ./.github/actions/build-cmake-preset with: + preset-name: clang-relwithdebinfo do-package: ${{ inputs.do_package }} retention-days: ${{ inputs.retention_days }} cmake-args: "-DCMAKE_BUILD_TYPE=Release \ diff --git a/.github/workflows/linux-asan.yml b/.github/workflows/linux-asan.yml index 56b128db5..55481e338 100644 --- a/.github/workflows/linux-asan.yml +++ b/.github/workflows/linux-asan.yml @@ -21,7 +21,7 @@ jobs: submodules: true - uses: ./.github/actions/build-cmake-preset with: - preset-name: clang14-relwithdebinfo + preset-name: clang-relwithdebinfo do-package: false cmake-args: "-D SILKIT_ENABLE_ASAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \ diff --git a/.github/workflows/linux-tsan.yml b/.github/workflows/linux-tsan.yml index f1e2653c2..f3e68dcf2 100644 --- a/.github/workflows/linux-tsan.yml +++ b/.github/workflows/linux-tsan.yml @@ -22,7 +22,7 @@ jobs: submodules: true - uses: ./.github/actions/build-cmake-preset with: - preset-name: clang14-relwithdebinfo + preset-name: clang-relwithdebinfo do-package: false cmake-args: "-D SILKIT_ENABLE_THREADSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \ diff --git a/.github/workflows/linux-ubsan.yml b/.github/workflows/linux-ubsan.yml index 45e5a0128..43b3bd0a2 100644 --- a/.github/workflows/linux-ubsan.yml +++ b/.github/workflows/linux-ubsan.yml @@ -22,7 +22,7 @@ jobs: submodules: true - uses: ./.github/actions/build-cmake-preset with: - preset-name: clang14-relwithdebinfo + preset-name: clang-relwithdebinfo do-package: false cmake-args: "-D SILKIT_ENABLE_UBSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \