Skip to content

ci: Update images #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juergbi merged 2 commits into from
Jun 15, 2025
Merged

ci: Update images #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4eb164
sources/cargo.py: Specify exception type for import try except
juergbi Jun 14, 2025
9587e14
ci: Update images
juergbi Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/common.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions .github/compose/ci.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand 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}
Expand Down
2 changes: 1 addition & 1 deletion .github/run-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/buildstream_plugins/sources/cargo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
#
try:
from buildstream import SourceInfoMedium, SourceVersionType
except:
except ImportError:
pass


Expand Down
Loading