From 9bbe5c6b8c44e08c90510c36596d13e54ca0eea4 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Tue, 12 Apr 2022 15:40:12 +0100 Subject: [PATCH] patch 8.2.4743: clang 14 is available on CI Problem: Clang 14 is available on CI. Solution: Switch from clang 13 to 14. (closes #10157) --- .github/workflows/ci.yml | 14 +++++++------- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7462e6db7..700756603 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,17 +88,17 @@ jobs: fi sudo apt update && sudo apt install -y "${PKGS[@]}" - - name: Install clang-13 + - name: Install clang-14 if: matrix.compiler == 'clang' run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - . /etc/lsb-release - sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-13 main" - sudo apt-get install -y clang-13 llvm-13 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100 - sudo update-alternatives --set clang /usr/bin/clang-13 - sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-13 100 - sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-13 100 + sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-14 main" + sudo apt-get install -y clang-14 llvm-14 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100 + sudo update-alternatives --set clang /usr/bin/clang-14 + sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-14 100 + sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-14 100 - name: Set up environment run: | diff --git a/src/version.c b/src/version.c index 0c3b01c75..5c8bd2acd 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4743, /**/ 4742, /**/ -- 2.40.0