Skip to content

Commit 9b29f9c

Browse files
committed
removed ubuntu-20.04 and use ubuntu-24.04 as latest Ubuntu in CI
1 parent 44d097d commit 9b29f9c

14 files changed

Lines changed: 31 additions & 39 deletions

.github/workflows/CI-unixish-docker.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
permissions:
1616
contents: read
17-
17+
1818
jobs:
1919
build_cmake:
2020

@@ -23,13 +23,11 @@ jobs:
2323
image: ["ubuntu:24.04", "ubuntu:24.10"]
2424
include:
2525
- build_gui: false
26-
- image: "ubuntu:24.04"
27-
build_gui: true
2826
- image: "ubuntu:24.10"
2927
build_gui: true
3028
fail-fast: false # Prefer quick result
3129

32-
runs-on: ubuntu-22.04
30+
runs-on: ubuntu-24.04
3331

3432
# TODO: is this actually applied to the guest?
3533
env:
@@ -84,10 +82,10 @@ jobs:
8482

8583
strategy:
8684
matrix:
87-
image: ["ubuntu:24.04", "ubuntu:24.10"]
85+
image: ["ubuntu:24.10"]
8886
fail-fast: false # Prefer quick result
8987

90-
runs-on: ubuntu-22.04
88+
runs-on: ubuntu-24.04
9189

9290
container:
9391
image: ${{ matrix.image }}

.github/workflows/CI-unixish.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
23+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
2424
include:
2525
- use_qt6: On
26-
- os: ubuntu-20.04
27-
use_qt6: Off
2826
fail-fast: false # Prefer quick result
2927

3028
runs-on: ${{ matrix.os }}
@@ -85,11 +83,9 @@ jobs:
8583

8684
strategy:
8785
matrix:
88-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
86+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
8987
include:
9088
- use_qt6: On
91-
- os: ubuntu-20.04
92-
use_qt6: Off
9389
fail-fast: false # Prefer quick result
9490

9591
runs-on: ${{ matrix.os }}
@@ -175,7 +171,7 @@ jobs:
175171

176172
strategy:
177173
matrix:
178-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
174+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
179175
fail-fast: false # Prefer quick result
180176

181177
runs-on: ${{ matrix.os }}
@@ -209,7 +205,7 @@ jobs:
209205

210206
strategy:
211207
matrix:
212-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
208+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
213209
fail-fast: false # Prefer quick result
214210

215211
runs-on: ${{ matrix.os }}
@@ -243,7 +239,7 @@ jobs:
243239

244240
strategy:
245241
matrix:
246-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
242+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
247243
fail-fast: false # Prefer quick result
248244

249245
runs-on: ${{ matrix.os }}
@@ -267,7 +263,7 @@ jobs:
267263

268264
strategy:
269265
matrix:
270-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
266+
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
271267
include:
272268
- xdist_n: auto
273269
# FIXME: test_color_tty fails with xdist
@@ -294,8 +290,8 @@ jobs:
294290
sudo apt-get install libxml2-utils
295291
296292
# packages for strict cfg checks
297-
- name: Install missing software on ubuntu 22.04 (cfg)
298-
if: matrix.os == 'ubuntu-22.04'
293+
- name: Install missing software on ubuntu (cfg)
294+
if: matrix.latest
299295
run: |
300296
sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libselinux-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev
301297
@@ -374,12 +370,12 @@ jobs:
374370
TEST_CPPCHECK_INJECT_BUILDDIR: injected
375371

376372
- name: Run cfg tests
377-
if: matrix.os != 'ubuntu-22.04'
373+
if: ${{ !matrix.latest }}
378374
run: |
379375
make -j$(nproc) checkcfg
380376
381377
- name: Run cfg tests (strict)
382-
if: matrix.os == 'ubuntu-22.04'
378+
if: matrix.latest
383379
run: |
384380
make -j$(nproc) checkcfg
385381
env:
@@ -471,7 +467,7 @@ jobs:
471467
PYTHONPATH: ./addons
472468

473469
- name: Build democlient
474-
if: matrix.os == 'ubuntu-22.04'
470+
if: matrix.latest
475471
run: |
476472
warnings="-pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar"
477473
g++ $warnings -c -Ilib -Iexternals/tinyxml2 democlient/democlient.cpp
@@ -490,7 +486,7 @@ jobs:
490486
selfcheck:
491487
needs: build # wait for all tests to be successful first
492488

493-
runs-on: ubuntu-22.04 # run on the latest image only
489+
runs-on: ubuntu-24.04 # run on the latest image only
494490

495491
steps:
496492
- uses: actions/checkout@v4

.github/workflows/asan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
build:
2020

21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222

2323
env:
2424
QT_VERSION: 6.8.2

.github/workflows/buildman.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
path: output
4545

4646
manpage:
47-
runs-on: ubuntu-22.04
47+
runs-on: ubuntu-24.04
4848
steps:
4949
- uses: actions/checkout@v4
5050
with:

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
build:
2323

24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525

2626
env:
2727
QT_VERSION: 6.8.2

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
analyze:
2020
name: Analyze
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222
permissions:
2323
security-events: write
2424

@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@v4
3737
with:
3838
persist-credentials: false
39-
39+
4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
4242
uses: github/codeql-action/init@v3

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
build:
2020

21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222

2323
steps:
2424
- uses: actions/checkout@v4

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
build:
2020

21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222

2323
steps:
2424
- uses: actions/checkout@v4

.github/workflows/iwyu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
use_libcxx: On
161161
fail-fast: false
162162

163-
runs-on: ubuntu-22.04
163+
runs-on: ubuntu-24.04
164164
if: ${{ github.repository_owner == 'danmar' }}
165165

166166
env:

.github/workflows/scriptcheck.yml

Lines changed: 3 additions & 5 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']
@@ -205,7 +203,7 @@ jobs:
205203
dmake:
206204
strategy:
207205
matrix:
208-
os: [ubuntu-22.04, macos-13, windows-2022]
206+
os: [ubuntu-24.04, macos-13, windows-2022]
209207
fail-fast: false
210208

211209
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)