summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2021-10-12 12:02:49 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-12 12:02:49 +0100
commit3a724290c5dd8e4b7c9a1fa8941b81f6f80db00a (patch)
treeed11b219e3a28907a07c943633bd3394e1e7f9d7
parent3d031a0ae791f901c0c2dedd5d8b9de137c23acc (diff)
patch 8.2.3500: Github CI fails to install clangv8.2.3500
Problem: Github CI fails to install clang. Solution: Install llvm-11 explicitly. (Christian Brabandt, closes #8993)
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5bfcc79e9e..99223229f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
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}-11 main"
- sudo apt-get install -y clang-11
+ sudo apt-get install -y clang-11 llvm-11
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100
sudo update-alternatives --set clang /usr/bin/clang-11
sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-11 100
diff --git a/src/version.c b/src/version.c
index 8497e7d563..e09abfa22d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3500,
+/**/
3499,
/**/
3498,