From 8a9a4e2e8d174e7b17f785a0a1b40d27bf72c7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Mon, 1 Sep 2025 10:16:33 +0200 Subject: [PATCH 1/2] .github/run-ci.sh: Add missing debian-12 and debian-13 --- .github/run-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/run-ci.sh b/.github/run-ci.sh index 173cfcdb4..fb30cfbd7 100755 --- a/.github/run-ci.sh +++ b/.github/run-ci.sh @@ -102,7 +102,7 @@ function runServiceTest() { if [ -z "${test_names}" ]; then - for test_name in mypy debian-11 fedora-41 fedora-42 fedora-missing-deps ubuntu-22.04; do + for test_name in mypy debian-11 debian-12 debian-13 fedora-41 fedora-42 fedora-missing-deps ubuntu-22.04; do if ! runTest "${test_name}"; then echo "Tests failed" exit 1 From e30f22b83ec881f2bc8a87a0e1e7c35f3aed1229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Mon, 1 Sep 2025 10:17:40 +0200 Subject: [PATCH 2/2] ci: Drop Fedora 41 Fedora 41 and 42 use the same version of Python. --- .github/compose/ci.docker-compose.yml | 6 +----- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index e31be6f8a..ac8548626 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' x-tests-template: &tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest} command: tox -vvvvv -- --color=yes --integration environment: TOXENV: ${CI_TOXENV_ALL} @@ -34,10 +34,6 @@ services: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:13-${CI_IMAGE_VERSION:-latest} - fedora-41: - <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} - fedora-42: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest} diff --git a/.github/run-ci.sh b/.github/run-ci.sh index fb30cfbd7..62cdcf7a0 100755 --- a/.github/run-ci.sh +++ b/.github/run-ci.sh @@ -102,7 +102,7 @@ function runServiceTest() { if [ -z "${test_names}" ]; then - for test_name in mypy debian-11 debian-12 debian-13 fedora-41 fedora-42 fedora-missing-deps ubuntu-22.04; do + for test_name in mypy debian-11 debian-12 debian-13 fedora-42 fedora-missing-deps ubuntu-22.04; do if ! runTest "${test_name}"; then echo "Tests failed" exit 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7ac85b00..7690bdef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,6 @@ jobs: - debian-11 - debian-12 - debian-13 - - fedora-41 - fedora-42 - fedora-missing-deps - ubuntu-22.04