Skip to content

Commit 9be736f

Browse files
pheiduckbrammool
authored andcommitted
patch 9.0.1474: CI runs with old version of Ubuntu and tools
Problem: CI runs with old version of Ubuntu and tools. Solution: Update CI to more recent versions. (closes #11092)
1 parent 0172270 commit 9be736f

3 files changed

Lines changed: 24 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ permissions:
1717

1818
jobs:
1919
linux:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121

2222
env:
2323
CC: ${{ matrix.compiler }}
24+
GCC_VER: 12
25+
CLANG_VER: 16
2426
TEST: test
2527
SRCDIR: ./src
2628
LEAK_CFLAGS: -DEXITFREE
@@ -81,10 +83,10 @@ jobs:
8183
lcov \
8284
libcanberra-dev \
8385
libperl-dev \
84-
python-dev \
86+
python2-dev \
8587
python3-dev \
86-
liblua5.3-dev \
87-
lua5.3 \
88+
liblua5.4-dev \
89+
lua5.4 \
8890
ruby-dev \
8991
tcl-dev \
9092
cscope \
@@ -93,24 +95,24 @@ jobs:
9395
fi
9496
sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"
9597
96-
- name: Install gcc-11
98+
- name: Install gcc-${{ env.GCC_VER }}
9799
if: matrix.compiler == 'gcc'
98100
run: |
99-
sudo apt-get install -y gcc-11
100-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
101-
sudo update-alternatives --set gcc /usr/bin/gcc-11
101+
sudo apt-get install -y gcc-${{ env.GCC_VER }}
102+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
103+
sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}
102104
103-
- name: Install clang-16
105+
- name: Install clang-${{ env.CLANG_VER }}
104106
if: matrix.compiler == 'clang'
105107
run: |
106108
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
107109
. /etc/lsb-release
108-
sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-16 main"
109-
sudo apt-get install -y clang-16 llvm-16
110-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
111-
sudo update-alternatives --set clang /usr/bin/clang-16
112-
sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-16 100
113-
sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-16 100
110+
sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-${{ env.CLANG_VER }} main"
111+
sudo apt-get install -y clang-${{ env.CLANG_VER }} llvm-${{ env.CLANG_VER }}
112+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 100
113+
sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }}
114+
sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${{ env.CLANG_VER }} 100
115+
sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-${{ env.CLANG_VER }} 100
114116
115117
- name: Set up environment
116118
run: |

.github/workflows/coverity.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99

1010
jobs:
1111
scan:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
env:
1515
CC: gcc
@@ -32,15 +32,15 @@ jobs:
3232
- name: Install packages
3333
if: env.TOKEN
3434
run: |
35-
sudo apt update && sudo apt install -y \
35+
sudo apt-get update && sudo apt-get install -y \
3636
autoconf \
3737
gettext \
3838
libcanberra-dev \
3939
libperl-dev \
40-
python-dev \
40+
python2-dev \
4141
python3-dev \
42-
liblua5.3-dev \
43-
lua5.3 \
42+
liblua5.4-dev \
43+
lua5.4 \
4444
ruby-dev \
4545
tcl-dev \
4646
libgtk2.0-dev \

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1474,
698700
/**/
699701
1473,
700702
/**/

0 commit comments

Comments
 (0)