0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.2.4764: CI uses an older gcc version

Problem:    CI uses an older gcc version.
Solution:   Use GCC 11. (closes #10185)
This commit is contained in:
Philip H
2022-04-16 20:04:30 +01:00
committed by Bram Moolenaar
parent f50808ed13
commit d2edee5cf3
3 changed files with 13 additions and 2 deletions

View File

@@ -21,6 +21,7 @@ jobs:
TEST: test TEST: test
SRCDIR: ./src SRCDIR: ./src
LEAK_CFLAGS: -DEXITFREE LEAK_CFLAGS: -DEXITFREE
CFLAGS: -Wno-error=deprecated-declarations
LOG_DIR: ${{ github.workspace }}/logs LOG_DIR: ${{ github.workspace }}/logs
TERM: xterm TERM: xterm
DISPLAY: ':99' DISPLAY: ':99'
@@ -88,13 +89,21 @@ jobs:
fi fi
sudo apt update && sudo apt install -y "${PKGS[@]}" 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 - name: Install clang-14
if: matrix.compiler == 'clang' if: matrix.compiler == 'clang'
run: | run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
. /etc/lsb-release . /etc/lsb-release
sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-14 main" 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 --install /usr/bin/clang clang /usr/bin/clang-14 100
sudo update-alternatives --set clang /usr/bin/clang-14 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/llvm-cov llvm-cov /usr/bin/llvm-cov-14 100

View File

@@ -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:libX11.so.6
leak:libXt.so.6 leak:libXt.so.6
leak:libcairo.so.2 leak:libcairo.so.2

View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4764,
/**/ /**/
4763, 4763,
/**/ /**/