diff --git a/.github/common.env b/.github/common.env index c43a36c..70890b4 100644 --- a/.github/common.env +++ b/.github/common.env @@ -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 diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 7c07df6..ce8b3f5 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} @@ -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} diff --git a/.github/run-ci.sh b/.github/run-ci.sh index 1c9ebcc..a8e302f 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-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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c12ad1b..2341374 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 @@ -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. @@ -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. diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 67ef1a4..c40ede3 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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. @@ -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: diff --git a/setup.py b/setup.py index 55bc4d7..576c4e6 100755 --- a/setup.py +++ b/setup.py @@ -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.", diff --git a/tox.ini b/tox.ini index e483d1f..8c71bf6 100644 --- a/tox.ini +++ b/tox.ini @@ -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 # @@ -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 @@ -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