From 5e34a41f065e981ae3eb012c08128e738b70f26f Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 15 May 2024 14:26:00 -0400 Subject: [PATCH] CI: Be a bit less paranoid about old compiler versions existing We explicitly tell CMake what compiler to use. No need to remove older versions, which was just one extra thing we needed to maintain. --- .github/actions/setup/action.yml | 1 - .github/workflows/lagom-template.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1c67632f640144..a375f39f1d3519 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -22,7 +22,6 @@ runs: # Packages below aren't. set -e - sudo apt-get purge -y clang-13 clang-14 clang-15 gcc-10 gcc-11 gcc-12 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' diff --git a/.github/workflows/lagom-template.yml b/.github/workflows/lagom-template.yml index c08428007c40e1..48c69c4a7e6053 100644 --- a/.github/workflows/lagom-template.yml +++ b/.github/workflows/lagom-template.yml @@ -115,8 +115,8 @@ jobs: -DENABLE_FUZZERS_LIBFUZZER=ON \ -DENABLE_ADDRESS_SANITIZER=ON \ -DSERENITY_CACHE_DIR=${{ github.workspace }}/Build/caches \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER=${{ steps.build-parameters.outputs.host_cc }} \ + -DCMAKE_CXX_COMPILER=${{ steps.build-parameters.outputs.host_cxx }} \ -DCMAKE_PREFIX_PATH=tool-install # === BUILD ===