This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch juerg/ci in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
commit f952947ab61efa46eabe7d85cec1d90d7ddce33a Author: Jürg Billeter <[email protected]> AuthorDate: Thu Aug 15 20:42:38 2024 +0200 ci: Update to Fedora 40 --- .github/common.env | 2 +- .github/compose/ci.docker-compose.yml | 10 +++------- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/common.env b/.github/common.env index 166f1f6..c1f43f7 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables -CI_IMAGE_VERSION=master-1361451963 +CI_IMAGE_VERSION=master-1408971201 CI_TOXENV_ALL=py38,py39,py310,py311,py312 CI_TOXENV_MASTER=py38-bst-master,py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 1cf5903..a295ecd 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:39-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest} command: tox -vvvvv -- --color=yes --integration environment: TOXENV: ${CI_TOXENV_ALL} @@ -22,13 +22,9 @@ x-tests-template: &tests-template services: - fedora-38: + fedora-40: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:38-${CI_IMAGE_VERSION:-latest} - - fedora-39: - <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:39-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest} ubuntu-20.04: <<: *tests-template diff --git a/.github/run-ci.sh b/.github/run-ci.sh index 6cf5acd..07709de 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 fedora-38 fedora-39 fedora-missing-deps ubuntu-20.04"; do + for test_name in "mypy fedora-40 fedora-missing-deps ubuntu-20.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 b73831b..5501137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,7 @@ jobs: # The names here should map to a valid service defined in # "../compose/ci.docker-compose.yml" test-name: - - fedora-38 - - fedora-39 + - fedora-40 - fedora-missing-deps - ubuntu-20.04 - lint
