Skip to content

Commit 4d4819d

Browse files
committed
Bump ubuntu to 24.04 on CI
1 parent 6f598c0 commit 4d4819d

6 files changed

+30
-12
lines changed

.github/workflows/build-debian-multiarch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ env:
4949
jobs:
5050
build-multiarch:
5151
name: Debian (Bookworm - 12) [${{ matrix.arch }}]
52-
runs-on: ubuntu-22.04
52+
runs-on: ubuntu-24.04
5353

5454
strategy:
5555
fail-fast: false # if a particular matrix build fails, don't skip the rest
@@ -120,7 +120,7 @@ jobs:
120120
test-armv7-on-armv6:
121121
needs: build-multiarch
122122
name: Debian (Bookworm - 12) [build - armv7, test - armv6]
123-
runs-on: ubuntu-22.04
123+
runs-on: ubuntu-24.04
124124
steps:
125125
- name: Download all multiarch artifacts
126126
uses: actions/download-artifact@v4

.github/workflows/build-manylinux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ concurrency:
3838
jobs:
3939
build:
4040
name: ${{ matrix.arch }}
41-
runs-on: ubuntu-22.04
41+
runs-on: ubuntu-24.04
4242
permissions:
4343
contents: read
4444
packages: write

.github/workflows/build-ubuntu-coverage.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ jobs:
4848
strategy:
4949
fail-fast: false # if a particular matrix build fails, don't skip the rest
5050
matrix:
51-
os: [ubuntu-22.04]
51+
os: [ubuntu-24.04]
52+
53+
env:
54+
# Pip now forces us to either make a venv or set this flag, so we will do
55+
# this
56+
PIP_BREAK_SYSTEM_PACKAGES: 1
5257

5358
steps:
5459
- uses: actions/checkout@v4.1.7

.github/workflows/build-ubuntu-sdist.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ jobs:
4848
strategy:
4949
fail-fast: false # if a particular matrix build fails, don't skip the rest
5050
matrix:
51-
os: [ubuntu-20.04, ubuntu-22.04]
51+
os: [ubuntu-24.04, ubuntu-22.04]
52+
53+
env:
54+
# Pip now forces us to either make a venv or set this flag, so we will do
55+
# this
56+
PIP_BREAK_SYSTEM_PACKAGES: 1
5257

5358
steps:
5459
- uses: actions/checkout@v4.1.7
@@ -76,14 +81,13 @@ jobs:
7681
run: python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300
7782

7883
- name: Test typestubs
79-
if: matrix.os == 'ubuntu-22.04' # run stubtest only once
8084
run: |
8185
pip3 install mypy
8286
python3 buildconfig/stubs/stubcheck.py
8387
8488
# We upload the generated files under github actions assets
8589
- name: Upload sdist
86-
if: matrix.os == 'ubuntu-20.04' # upload sdist only once
90+
if: matrix.os == 'ubuntu-24.04' # upload sdist only once
8791
uses: actions/upload-artifact@v4
8892
with:
8993
name: pygame-wheels-sdist

.github/workflows/cppcheck.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
# TODO: Any more static checkers can be added here
2020
jobs:
2121
run-cppcheck:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323

2424
steps:
2525
- uses: actions/checkout@v4.1.7
@@ -32,6 +32,10 @@ jobs:
3232
sudo apt install cppcheck
3333
3434
- name: Run Static Checker
35-
# skip cppcheck on SDL_gfx and scrap for now
36-
run: cppcheck src_c --force --enable=performance,portability,warning \
37-
--suppress=*:src_c/SDL_gfx/* --suppress=*:src_c/scrap*
35+
# skip cppcheck on SDL_gfx, scrap, scale_mm* and ft_cache for now
36+
# suppress missingReturn and syntaxError because it gives many false positives
37+
run: cppcheck src_c --enable=performance,portability,warning \
38+
--suppress=*:src_c/freetype/ft_cache.c --suppress=*:src_c/scrap* \
39+
--suppress=*:src_c/scale_mmx*.c --suppress=*:src_c/SDL_gfx/* \
40+
--suppress=missingReturn --suppress=syntaxError -DWITH_THREAD -j $(nproc) \
41+
-DPG_MAJOR_VERSION -DPG_MINOR_VERSION -DPG_PATCH_VERSION -DPG_VERSION_TAG

.github/workflows/format-lint.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ jobs:
3737
- uses: pre-commit/action@v3.0.1
3838

3939
format-lint-code-check:
40-
runs-on: ubuntu-22.04
40+
runs-on: ubuntu-24.04
41+
42+
env:
43+
# Pip now forces us to either make a venv or set this flag, so we will do
44+
# this
45+
PIP_BREAK_SYSTEM_PACKAGES: 1
4146

4247
steps:
4348
- uses: actions/checkout@v4.1.7

0 commit comments

Comments
 (0)