diff options
| author | Philip H <47042125+pheiduck@users.noreply.github.com> | 2023-05-16 20:11:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-16 20:11:02 +0100 |
| commit | 7268e539968de227d49ffc66adb79e558502743e (patch) | |
| tree | 40425641546a92577724ad3d857837105297cef1 | |
| parent | 798fa76dbf737f855e47b10bf326453866b429ab (diff) | |
| download | vim-git-7268e539968de227d49ffc66adb79e558502743e.tar.gz | |
patch 9.0.1562: mixing package managers is not a good ideav9.0.1562
Problem: Mixing package managers is not a good idea.
Solution: Install gcc 13 with apt-get. (closes #12405)
| -rw-r--r-- | .github/workflows/ci.yml | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd903dc93..4e6f23ba8 100644 --- 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 index 9f6484354..80244d6fe 100644 --- 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, |