Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/common.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Shared common variables

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
CI_IMAGE_VERSION=master-2106151116
CI_TOXENV_ALL=py39,py310,py311,py312,py313,py314
CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master,py314-bst-master
14 changes: 11 additions & 3 deletions .github/compose/ci.docker-compose.yml
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: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}
Expand All @@ -26,14 +26,22 @@ services:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:11-${CI_IMAGE_VERSION:-latest}

fedora-41:
debian-12:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:12-${CI_IMAGE_VERSION:-latest}

debian-13:
<<: *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-debian:13-${CI_IMAGE_VERSION:-latest}

fedora-42:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest}

fedora-43:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:43-${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
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-41 fedora-42 fedora-missing-deps ubuntu-22.04"; do
for test_name in "mypy debian-11 debian-12 debian-13 fedora-42 fedora-43 fedora-missing-deps ubuntu-22.04"; do
if ! runTest "${test_name}"; then
echo "Tests failed"
exit 1
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ concurrency:

jobs:
tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
continue-on-error: ${{ matrix.allow-failure || false }}

strategy:
Expand All @@ -37,8 +37,10 @@ jobs:
# "../compose/ci.docker-compose.yml"
test-name:
- debian-11
- fedora-41
- debian-12
- debian-13
- fedora-42
- fedora-43
- fedora-missing-deps
- ubuntu-22.04
- lint
Expand All @@ -49,6 +51,9 @@ jobs:
allow-failure: true

steps:
- name: Disable AppArmor restriction for bubblewrap
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

- name: Check out repository
uses: actions/checkout@v2
# BuildStream requires tags to be able to find its version.
Expand All @@ -60,8 +65,11 @@ jobs:
${GITHUB_WORKSPACE}/.github/run-ci.sh ${{ matrix.test-name }}

docs:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Disable AppArmor restriction for bubblewrap
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

- name: Check out repository
uses: actions/checkout@v2
# BuildStream requires tags to be able to find its version.
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ on:
jobs:
build:
name: Build documentation
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Disable AppArmor restriction for bubblewrap
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

- name: Checkout code
uses: actions/checkout@v2
# BuildStream requires tags to be able to find its version.
Expand Down Expand Up @@ -40,9 +43,12 @@ jobs:

publish:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:

- name: Disable AppArmor restriction for bubblewrap
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

- name: Download artifact
uses: actions/download-artifact@v4
with:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Topic :: Software Development :: Build Tools",
],
description="A collection of plugins for BuildStream.",
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Tox global configuration
#
[tox]
envlist = py{39,310,311,312,313}-{bst-fixed,bst-master}
envlist = py{39,310,311,312,313,314}-{bst-fixed,bst-master}
skip_missing_interpreters = true

#
Expand All @@ -27,7 +27,7 @@ skip_missing_interpreters = true
[testenv]
commands =
bst --version
./tests/bzr_wrapper {envdir}/bin
{toxinidir}/tests/bzr_wrapper {envdir}/bin
pytest --basetemp {envtmpdir} {posargs}
deps =
-rrequirements/test-requirements.txt
Expand Down Expand Up @@ -55,17 +55,17 @@ passenv =
# These keys are not inherited by any other sections
#
setenv =
py{39,310,311,312,313}: XDG_CACHE_HOME = {envtmpdir}/cache
py{39,310,311,312,313}: XDG_CONFIG_HOME = {envtmpdir}/config
py{39,310,311,312,313}: XDG_DATA_HOME = {envtmpdir}/share
!master: BST_VERSION = 2.5.0.dev1
py{39,310,311,312,313,314}: XDG_CACHE_HOME = {envtmpdir}/cache
py{39,310,311,312,313,314}: XDG_CONFIG_HOME = {envtmpdir}/config
py{39,310,311,312,313,314}: XDG_DATA_HOME = {envtmpdir}/share
!master: BST_VERSION = 2.6.0
master: BST_VERSION = master

allowlist_externals =
py{39,310,311,312,313}:
py{39,310,311,312,313,314}:
mv
mkdir
./tests/bzr_wrapper
{toxinidir}/tests/bzr_wrapper

#
# Code formatters
Expand Down
Loading