From e4eb1648b1a80a8ea444d624bdd3c8794c7fa5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 14 Jun 2025 11:12:13 +0200 Subject: [PATCH 1/2] sources/cargo.py: Specify exception type for import try except Fixes this pylint warning: cargo.py:102:0: W0702: No exception type(s) specified (bare-except) --- src/buildstream_plugins/sources/cargo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildstream_plugins/sources/cargo.py b/src/buildstream_plugins/sources/cargo.py index 03dd742..c0e78d3 100644 --- a/src/buildstream_plugins/sources/cargo.py +++ b/src/buildstream_plugins/sources/cargo.py @@ -99,7 +99,7 @@ # try: from buildstream import SourceInfoMedium, SourceVersionType -except: +except ImportError: pass From 9587e14bfa872c2e2421b580a2846c0cfcf01359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 14 Jun 2025 11:00:55 +0200 Subject: [PATCH 2/2] ci: Update images Drop Fedora 40, add Fedora 42, and update BuildBox to 1.3.21. --- .github/common.env | 2 +- .github/compose/ci.docker-compose.yml | 10 +++++----- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/common.env b/.github/common.env index 3c65591..c43a36c 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables -CI_IMAGE_VERSION=master-1571408207 +CI_IMAGE_VERSION=master-1869708273 CI_TOXENV_ALL=py39,py310,py311,py312,py313 CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 6f69d52..7c07df6 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:40-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} command: tox -vvvvv -- --color=yes --integration environment: TOXENV: ${CI_TOXENV_ALL} @@ -26,14 +26,14 @@ services: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:11-${CI_IMAGE_VERSION:-latest} - fedora-40: - <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${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} + ubuntu-22.04: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:22.04-${CI_IMAGE_VERSION:-latest} diff --git a/.github/run-ci.sh b/.github/run-ci.sh index eebbbda..1c9ebcc 100755 --- a/.github/run-ci.sh +++ b/.github/run-ci.sh @@ -67,7 +67,7 @@ function runTest() { if [ -z "${test_names}" ]; then - for test_name in "mypy debian-11 fedora-40 fedora-41 fedora-missing-deps ubuntu-22.04"; do + for test_name in "mypy debian-11 fedora-41 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 6cd9c20..c12ad1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,8 @@ jobs: # "../compose/ci.docker-compose.yml" test-name: - debian-11 - - fedora-40 - fedora-41 + - fedora-42 - fedora-missing-deps - ubuntu-22.04 - lint