From c349518ac9551c9373de5f87e9c0dc6f7ac0b21d Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sun, 28 Aug 2022 11:32:41 +0200 Subject: [PATCH] Use apt-get to install Clang on CI --- .github/workflows/osrm-backend.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 5fc382b72..7504c3af1 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -138,7 +138,7 @@ jobs: runs-on: ubuntu-20.04 BUILD_TOOLS: ON BUILD_TYPE: Debug - CLANG_VERSION: "6.0" + CLANG_VERSION: 6 CUCUMBER_TIMEOUT: 60000 - name: clang-11.0-debug-clang-tidy @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-20.04 BUILD_TOOLS: ON BUILD_TYPE: Debug - CLANG_VERSION: "11.0" + CLANG_VERSION: 11 CUCUMBER_TIMEOUT: 60000 ENABLE_CLANG_TIDY: ON @@ -157,7 +157,7 @@ jobs: runs-on: ubuntu-20.04 BUILD_TOOLS: ON BUILD_TYPE: Release - CLANG_VERSION: "11.0" + CLANG_VERSION: 11 ENABLE_CONAN: ON ENABLE_SANITIZER: ON @@ -167,7 +167,7 @@ jobs: runs-on: ubuntu-20.04 BUILD_TOOLS: ON BUILD_TYPE: Release - CLANG_VERSION: "6.0" + CLANG_VERSION: 6 ENABLE_CONAN: ON # - name: gcc-11-release @@ -519,9 +519,9 @@ jobs: echo "CCOMPILER=clang" >> $GITHUB_ENV echo "CXXCOMPILER=clang++" >> $GITHUB_ENV sudo apt-get update -y && sudo apt-get install "clang++-${CLANG_VERSION}" - echo "XXX /usr/bin/clang++-${CLANG_VERSION}" - sudo update-alternatives --install /usr/bin/clang++ clang++ "/usr/bin/clang++-${CLANG_VERSION}" 10000000 - sudo update-alternatives --install /usr/bin/clang clang "/usr/bin/clang-${CLANG_VERSION}" 10000000 + echo "XXX /usr/bin/clang++-${CLANG_VERSION}.0" + sudo update-alternatives --install /usr/bin/clang++ clang++ "/usr/bin/clang++-${CLANG_VERSION}.0" 10000000 + sudo update-alternatives --install /usr/bin/clang clang "/usr/bin/clang-${CLANG_VERSION}.0" 10000000 # we only enable lto for release builds # and therefore don't need to us ld.gold or llvm tools for linking