From 9f9f24c3cc5290336b3060eb7b44869b60b5135d Mon Sep 17 00:00:00 2001 From: Dmitry Atamanov Date: Tue, 8 Feb 2022 15:05:38 +0500 Subject: [PATCH] CI config refactoring (#389) --- .github/workflows/main.yml | 8 ++++---- CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36340f9cb..48df47954 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,7 +86,7 @@ jobs: fail-fast: false matrix: build_type: [Release, Debug] - llvm_version: [12, 13, 14] + llvm_version: [12, 13, 14, 15] steps: - uses: actions/checkout@v2 @@ -97,10 +97,10 @@ jobs: - name: Install Clang ${{ matrix.llvm_version }} run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - if [[ "${{matrix.llvm_version}}" > 13 ]]; then - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" - else + if [[ "${{matrix.llvm_version}}" < 15 ]]; then sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${{matrix.llvm_version}} main" + else + sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" fi sudo apt-get update sudo apt-get install -y clang-${{matrix.llvm_version}} llvm-${{matrix.llvm_version}} llvm-${{matrix.llvm_version}}-dev lld-${{matrix.llvm_version}} liblld-${{matrix.llvm_version}}-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 6727d06ad..7391b7349 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ if(C3_USE_MIMALLOC) endif() if(NOT C3_LLVM_VERSION STREQUAL "auto") - if(${C3_LLVM_VERSION} VERSION_LESS 12 OR ${C3_LLVM_VERSION} VERSION_GREATER 14) + if(${C3_LLVM_VERSION} VERSION_LESS 12 OR ${C3_LLVM_VERSION} VERSION_GREATER 15) message(FATAL_ERROR "LLVM ${C3_LLVM_VERSION} is not supported!") endif() find_package(LLVM ${C3_LLVM_VERSION} REQUIRED CONFIG)