To: vim_dev@googlegroups.com Subject: Patch 8.2.4764 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4764 Problem: CI uses an older gcc version. Solution: Use GCC 11. (closes #10185) Files: .github/workflows/ci.yml, src/testdir/lsan-suppress.txt *** ../vim-8.2.4763/.github/workflows/ci.yml 2022-04-12 15:40:08.759997291 +0100 --- .github/workflows/ci.yml 2022-04-16 20:02:13.014006530 +0100 *************** *** 21,26 **** --- 21,27 ---- TEST: test SRCDIR: ./src LEAK_CFLAGS: -DEXITFREE + CFLAGS: -Wno-error=deprecated-declarations LOG_DIR: ${{ github.workspace }}/logs TERM: xterm DISPLAY: ':99' *************** *** 88,100 **** fi sudo apt update && sudo apt install -y "${PKGS[@]}" - 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 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 --- 89,109 ---- 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 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 *** ../vim-8.2.4763/src/testdir/lsan-suppress.txt 2022-04-16 10:08:47.858603269 +0100 --- src/testdir/lsan-suppress.txt 2022-04-16 20:02:13.014006530 +0100 *************** *** 1,4 **** ! # Suppress leaks from X libraries on Ubuntu bionic. leak:libX11.so.6 leak:libXt.so.6 leak:libcairo.so.2 --- 1,4 ---- ! # Suppress leaks from X libraries on Ubuntu focal. leak:libX11.so.6 leak:libXt.so.6 leak:libcairo.so.2 *** ../vim-8.2.4763/src/version.c 2022-04-16 18:52:13.225151870 +0100 --- src/version.c 2022-04-16 20:03:53.166118789 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4764, /**/ -- A)bort, R)etry, D)o it right this time /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///