# HG changeset patch # User Bram Moolenaar # Date 1684264505 -7200 # Node ID d5d43043adac8fc0a6d06f6dcb0005e85ca588da # Parent 2db9f2a3333a87ea0ba9a0453afa47efe37eb07a patch 9.0.1562: mixing package managers is not a good idea Commit: https://github.com/vim/vim/commit/7268e539968de227d49ffc66adb79e558502743e Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Tue May 16 20:11:02 2023 +0100 patch 9.0.1562: mixing package managers is not a good idea Problem: Mixing package managers is not a good idea. Solution: Install gcc 13 with apt-get. (closes https://github.com/vim/vim/issues/12405) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: env: CC: ${{ matrix.compiler }} - GCC_VER: 12 + GCC_VER: 13 CLANG_VER: 16 TEST: test SRCDIR: ./src @@ -98,10 +98,9 @@ jobs: - name: Install gcc-${{ env.GCC_VER }} if: matrix.compiler == 'gcc' run: | - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - brew install gcc@${{ env.GCC_VER }} - sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-${{ env.GCC_VER }} 100 - sudo update-alternatives --set gcc /home/linuxbrew/.linuxbrew/bin/gcc-${{ env.GCC_VER }} + sudo apt-get install -y gcc-${{ env.GCC_VER }} + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100 + sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }} - name: Install clang-${{ env.CLANG_VER }} if: matrix.compiler == 'clang' diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1562, +/**/ 1561, /**/ 1560,