To: vim_dev@googlegroups.com
Subject: Patch 9.0.1562
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1562
Problem:    Mixing package managers is not a good idea.
Solution:   Install gcc 13 with apt-get. (closes #12405)
Files:      .github/workflows/ci.yml


*** ../vim-9.0.1561/.github/workflows/ci.yml	2023-05-13 18:05:15.788057907 +0100
--- .github/workflows/ci.yml	2023-05-16 20:08:17.294540658 +0100
***************
*** 21,27 ****
  
      env:
        CC: ${{ matrix.compiler }}
!       GCC_VER: 12
        CLANG_VER: 16
        TEST: test
        SRCDIR: ./src
--- 21,27 ----
  
      env:
        CC: ${{ matrix.compiler }}
!       GCC_VER: 13
        CLANG_VER: 16
        TEST: test
        SRCDIR: ./src
***************
*** 98,107 ****
        - 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 }}
  
        - name: Install clang-${{ env.CLANG_VER }}
          if: matrix.compiler == 'clang'
--- 98,106 ----
        - name: Install gcc-${{ env.GCC_VER }}
          if:  matrix.compiler == 'gcc'
          run: |
!           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'
*** ../vim-9.0.1561/src/version.c	2023-05-15 18:17:20.282336344 +0100
--- src/version.c	2023-05-16 20:10:42.342654994 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1562,
  /**/

-- 
Change is inevitable, except from a vending machine.

 /// 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    ///