Skip to content

Commit b9ee645

Browse files
committed
removed ubuntu-20.04 from CI
1 parent 9a17cf1 commit b9ee645

2 files changed

Lines changed: 12 additions & 34 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
24-
include:
25-
- use_qt6: On
26-
- os: ubuntu-20.04
27-
use_qt6: Off
23+
os: [ubuntu-22.04, macos-13]
2824
fail-fast: false # Prefer quick result
2925

3026
runs-on: ${{ matrix.os }}
@@ -44,13 +40,7 @@ jobs:
4440
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4541

4642
- name: Install missing software on ubuntu
47-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
48-
run: |
49-
sudo apt-get update
50-
sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
51-
52-
- name: Install missing software on ubuntu
53-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
43+
if: contains(matrix.os, 'ubuntu')
5444
run: |
5545
sudo apt-get update
5646
sudo apt-get install libxml2-utils libtinyxml2-dev
@@ -68,7 +58,7 @@ jobs:
6858
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6959
if: contains(matrix.os, 'ubuntu')
7060
run: |
71-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
61+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7262
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7363
7464
- name: CMake build on macos (with GUI / system tinyxml2)
@@ -85,11 +75,7 @@ jobs:
8575

8676
strategy:
8777
matrix:
88-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
89-
include:
90-
- use_qt6: On
91-
- os: ubuntu-20.04
92-
use_qt6: Off
78+
os: [ubuntu-22.04, macos-13]
9379
fail-fast: false # Prefer quick result
9480

9581
runs-on: ${{ matrix.os }}
@@ -108,12 +94,6 @@ jobs:
10894
with:
10995
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
11096

111-
- name: Install missing software on ubuntu
112-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
113-
run: |
114-
sudo apt-get update
115-
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
116-
11797
# TODO: move latest compiler to separate step
11898
# TODO: bail out on warnings with latest GCC
11999
- name: Set up GCC
@@ -129,7 +109,7 @@ jobs:
129109
echo "CXX=g++-13" >> $GITHUB_ENV
130110
131111
- name: Install missing software on ubuntu
132-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
112+
if: contains(matrix.os, 'ubuntu')
133113
run: |
134114
sudo apt-get update
135115
sudo apt-get install libxml2-utils
@@ -147,7 +127,7 @@ jobs:
147127
- name: Run CMake on ubuntu (with GUI)
148128
if: contains(matrix.os, 'ubuntu')
149129
run: |
150-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
130+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
151131
152132
- name: Run CMake on macos (with GUI)
153133
if: contains(matrix.os, 'macos')
@@ -175,7 +155,7 @@ jobs:
175155

176156
strategy:
177157
matrix:
178-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
158+
os: [ubuntu-22.04, macos-13]
179159
fail-fast: false # Prefer quick result
180160

181161
runs-on: ${{ matrix.os }}
@@ -209,7 +189,7 @@ jobs:
209189

210190
strategy:
211191
matrix:
212-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
192+
os: [ubuntu-22.04, macos-13]
213193
fail-fast: false # Prefer quick result
214194

215195
runs-on: ${{ matrix.os }}
@@ -243,7 +223,7 @@ jobs:
243223

244224
strategy:
245225
matrix:
246-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
226+
os: [ubuntu-22.04, macos-13]
247227
fail-fast: false # Prefer quick result
248228

249229
runs-on: ${{ matrix.os }}
@@ -267,7 +247,7 @@ jobs:
267247

268248
strategy:
269249
matrix:
270-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
250+
os: [ubuntu-22.04, macos-13]
271251
include:
272252
- xdist_n: auto
273253
# FIXME: test_color_tty fails with xdist

.github/workflows/scriptcheck.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ permissions:
1818
jobs:
1919
build:
2020

21-
# 'ubuntu-22.04' removes Python 3.6 so keep the previous LTS version
22-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2322

2423
steps:
2524
- uses: actions/checkout@v4
@@ -46,8 +45,7 @@ jobs:
4645
scriptcheck:
4746

4847
needs: build
49-
# 'ubuntu-22.04' removes Python 3.6 so keep the previous LTS version
50-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
5149
strategy:
5250
matrix:
5351
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']

0 commit comments

Comments
 (0)