From f31554480897ae2550c3cb7214257c2db2ffad90 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 14 May 2023 01:42:28 +0200 Subject: [PATCH] ci: Shrink the purge a bit --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf74e16..1adb45c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -369,7 +369,7 @@ jobs: git IFS=$'-' compiler=($(echo "${{ matrix.compiler }}")) # ToDo: Can this be done without invoking a sub-shell? if [[ "${compiler[0]}" == "GCC" ]]; then - sudo apt-get purge "gcc*" "g++*" + sudo apt-get purge "gcc" "g++" sudo apt-get install \ binutils gcc-${compiler[1]} g++-${compiler[1]} sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${compiler[1]} 800 --slave /usr/bin/g++ g++ /usr/bin/g++-${compiler[1]} @@ -378,7 +378,7 @@ jobs: echo "CMAKE_C_FLAGS=-fuse-ld=ld" >> "$GITHUB_ENV" echo "CMAKE_CXX_FLAGS=-fuse-ld=ld" >> "$GITHUB_ENV" elif [[ "${compiler[0]}" == "Clang" ]]; then - sudo apt-get purge "*clang*" "*clangd*" "*clang++*" "lld*" "*clang-format*" "*clang-tidy*" + sudo apt-get purge "clang" "clangd" "clang++" "lld" "clang-format" "clang-tidy" curl -jLo /tmp/llvm.sh "https://apt.llvm.org/llvm.sh" chmod +x /tmp/llvm.sh sudo /tmp/llvm.sh ${compiler[1]} all