From bac98447ec3e9392707cce768cfe810c4660736f Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sun, 17 Jan 2021 15:12:49 +0100
Subject: [PATCH] :alembic: try to install Clang 11

---
 .github/workflows/ubuntu.yml | 17 +++++++++++------
 cmake/ci.cmake               |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 5e2357b65..6223511a1 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -70,9 +70,8 @@ jobs:
       - uses: actions/checkout@v1
       - name: install_gcc
         run: |
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
           sudo apt update
-          sudo apt install gcc-11 g++-11 ninja-build
+          sudo apt install gcc-10 g++-10 ninja-build
         shell: bash
       - name: cmake
         run: cmake -S . -B build -DJSON_CI=On
@@ -87,15 +86,21 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: install_clang
+      - name: install_ninja
         run: |
           sudo apt update
-          sudo apt install clang-10 ninja-build
+          sudo apt install ninja-build
+        shell: bash
+      - name: install_clang
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 11
         shell: bash
       - name: cmake
         run: cmake -S . -B build -DJSON_CI=On
         env:
-          CC:   clang-10
-          CXX:  clang++-10
+          CC:   clang-11
+          CXX:  clang++-11
       - name: build
         run: cmake --build build --target ci_test_clang --parallel 10
diff --git a/cmake/ci.cmake b/cmake/ci.cmake
index 2da75f434..5259c64e6 100644
--- a/cmake/ci.cmake
+++ b/cmake/ci.cmake
@@ -17,7 +17,7 @@ execute_process(COMMAND ${CLANG_TIDY_TOOL} --version OUTPUT_VARIABLE CLANG_TIDY_
 string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TIDY_TOOL_VERSION "${CLANG_TIDY_TOOL_VERSION}")
 message(STATUS "🔖 Clang-Tidy ${CLANG_TIDY_TOOL_VERSION} (${CLANG_TIDY_TOOL})")
 
-find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++-10 clang++)
+find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++)
 execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION)
 string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}")
 message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})")