patch 8.2.4764: CI uses an older gcc version

Problem:    CI uses an older gcc version.
Solution:   Use GCC 11. (closes #10185)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70075660391eb64ff7c4d529278f225dcd167402..4bb5e29fc08de21323369d10045ea740099919f4 100644 (file)
--- 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

diff --git a/src/testdir/lsan-suppress.txt b/src/testdir/lsan-suppress.txt
index ec999fa6d3a8817536551fa5a8c6c1e6f99cac78..c0d906150a4928b647ed8883461dc0de35442d2f 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index d6f2ef4314372734f7c0f46d3696e07c0e4b198e..ad301a83813ad67aa82a0712bb8822a9fbaf35eb 100644 (file)
--- 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 */
+/**/
+    4764,
 /**/
     4763,
 /**/