GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 09:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.1562: mixing package managers is not a good idea

Browse Source 
Problem:    Mixing package managers is not a good idea.
Solution:   Install gcc 13 with apt-get. (closes #12405)
This commit is contained in:
Philip H
2023-05-16 20:11:02 +01:00
committed by Bram Moolenaar
parent 798fa76dbf
commit 7268e53996
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
env: env:
CC: ${{ matrix.compiler }} CC: ${{ matrix.compiler }}
GCC_VER: 12 GCC_VER: 13
CLANG_VER: 16 CLANG_VER: 16
TEST: test TEST: test
SRCDIR: ./src SRCDIR: ./src
@ -98,10 +98,9 @@ jobs:
- name: Install gcc-${{ env.GCC_VER }} - name: Install gcc-${{ env.GCC_VER }}
if: matrix.compiler == 'gcc' if: matrix.compiler == 'gcc'
run: | run: |
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" sudo apt-get install -y gcc-${{ env.GCC_VER }}
brew install gcc@${{ env.GCC_VER }} sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-${{ env.GCC_VER }} 100 sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}
sudo update-alternatives --set gcc /home/linuxbrew/.linuxbrew/bin/gcc-${{ env.GCC_VER }}
- name: Install clang-${{ env.CLANG_VER }} - name: Install clang-${{ env.CLANG_VER }}
if: matrix.compiler == 'clang' if: matrix.compiler == 'clang'

2
src/version.c
View File

@ -695,6 +695,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 */
/**/
1562,
/**/ /**/
1561, 1561,
/**/ /**/