diff --git a/.circleci/config.yml b/.circleci/config.yml index 0215cfc..0ee718f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -289,6 +289,33 @@ jobs: ./dev_scripts/env.py --distro fedora --version 37 run --dev \ bash -c 'cd dangerzone; poetry run make test' + ci-debian-trixie: + machine: + image: ubuntu-2004:202111-01 + steps: + - checkout + - run: *install-podman + + - run: + name: Prepare cache directory + command: | + sudo mkdir -p /caches + sudo chown -R $USER:$USER /caches + - run: *calculate-cache-key + - restore_cache: *restore-cache + - run: *copy-image + + - run: + name: Prepare Dangerzone environment + command: | + ./dev_scripts/env.py --distro debian --version trixie build-dev + + - run: + name: Run CI tests + command: | + ./dev_scripts/env.py --distro debian --version trixie run --dev \ + bash -c 'cd dangerzone; poetry run make test' + ci-debian-bookworm: machine: image: ubuntu-2004:202111-01 @@ -413,6 +440,18 @@ jobs: - run: *copy-image - run: *build-deb + build-debian-trixie: + docker: + - image: debian:trixie + resource_class: medium+ + steps: + - run: *install-dependencies-deb + - checkout + - run: *calculate-cache-key + - restore_cache: *restore-cache + - run: *copy-image + - run: *build-deb + build-debian-bookworm: docker: - image: debian:bookworm @@ -480,6 +519,9 @@ workflows: - ci-ubuntu-focal: requires: - build-container-image + - ci-debian-trixie: + requires: + - build-container-image - ci-debian-bookworm: requires: - build-container-image @@ -504,6 +546,9 @@ workflows: - build-debian-bullseye: requires: - build-container-image + - build-debian-trixie: + requires: + - build-container-image - build-debian-bookworm: requires: - build-container-image diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40b8fb7..eac5090 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,9 @@ jobs: - target: debian-bookworm distro: debian version: bookworm + - target: debian-trixie + distro: debian + version: trixie steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 5918c50..7730d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or ### Added - Platform support: Alpha integration with Qubes OS ([issue #411](https://github.com/freedomofpress/dangerzone/issues/411)) +- Platform support: Debian Trixie (13) ### Removed diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index 4e90a3d..a7523f1 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -778,6 +778,11 @@ class QADebianBookworm(QADebianBased): VERSION = "bookworm" +class QADebianTrixie(QADebianBased): + DISTRO = "debian" + VERSION = "trixie" + + class QAUbuntu2004(QADebianBased): DISTRO = "ubuntu" VERSION = "20.04"