Mercurial > vim

changeset 28479:da67829ad0d3 v8.2.4764

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4764: CI uses an older gcc version Commit: https://github.com/vim/vim/commit/d2edee5cf3bd1eb69d88a12bcab33fc4228e83c0 Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Sat Apr 16 20:04:30 2022 +0100 patch 8.2.4764: CI uses an older gcc version Problem: CI uses an older gcc version. Solution: Use GCC 11. (closes https://github.com/vim/vim/issues/10185)
author Bram Moolenaar <Bram@vim.org>
date Sat, 16 Apr 2022 21:15:03 +0200
parents f7119d11e5ab
children a08f13ce2bd0
files .github/workflows/ci.yml src/testdir/lsan-suppress.txt src/version.c
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ jobs:
       TEST: test
       SRCDIR: ./src
       LEAK_CFLAGS: -DEXITFREE
+      CFLAGS: -Wno-error=deprecated-declarations
       LOG_DIR: ${{ github.workspace }}/logs
       TERM: xterm
       DISPLAY: ':99'
@@ -88,13 +89,21 @@ jobs:
           fi
           sudo apt update && sudo apt install -y "${PKGS[@]}"
 
+      - name: Install gcc-11
+        if:  matrix.compiler == 'gcc'
+        run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt install -y gcc-11
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
+          sudo update-alternatives --set gcc /usr/bin/gcc-11
+
       - 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}-14 main"
-          sudo apt-get install -y clang-14 llvm-14
+          sudo apt 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
--- a/src/testdir/lsan-suppress.txt
+++ b/src/testdir/lsan-suppress.txt
@@ -1,4 +1,4 @@
-# Suppress leaks from X libraries on Ubuntu bionic.
+# Suppress leaks from X libraries on Ubuntu focal.
 leak:libX11.so.6
 leak:libXt.so.6
 leak:libcairo.so.2
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4764,
+/**/
     4763,
 /**/
     4762,