Adds support for Debian Trixie (13)

Fixes #452
This commit is contained in:
deeplow 2023-06-27 10:55:56 +01:00
parent 5b58576854
commit e773add68e
No known key found for this signature in database
GPG key ID: 577982871529A52A
4 changed files with 54 additions and 0 deletions

View file

@ -289,6 +289,33 @@ jobs:
./dev_scripts/env.py --distro fedora --version 37 run --dev \ ./dev_scripts/env.py --distro fedora --version 37 run --dev \
bash -c 'cd dangerzone; poetry run make test' 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: ci-debian-bookworm:
machine: machine:
image: ubuntu-2004:202111-01 image: ubuntu-2004:202111-01
@ -413,6 +440,18 @@ jobs:
- run: *copy-image - run: *copy-image
- run: *build-deb - 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: build-debian-bookworm:
docker: docker:
- image: debian:bookworm - image: debian:bookworm
@ -480,6 +519,9 @@ workflows:
- ci-ubuntu-focal: - ci-ubuntu-focal:
requires: requires:
- build-container-image - build-container-image
- ci-debian-trixie:
requires:
- build-container-image
- ci-debian-bookworm: - ci-debian-bookworm:
requires: requires:
- build-container-image - build-container-image
@ -504,6 +546,9 @@ workflows:
- build-debian-bullseye: - build-debian-bullseye:
requires: requires:
- build-container-image - build-container-image
- build-debian-trixie:
requires:
- build-container-image
- build-debian-bookworm: - build-debian-bookworm:
requires: requires:
- build-container-image - build-container-image

View file

@ -98,6 +98,9 @@ jobs:
- target: debian-bookworm - target: debian-bookworm
distro: debian distro: debian
version: bookworm version: bookworm
- target: debian-trixie
distro: debian
version: trixie
steps: steps:
- name: Checkout - name: Checkout

View file

@ -10,6 +10,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
### Added ### Added
- Platform support: Alpha integration with Qubes OS ([issue #411](https://github.com/freedomofpress/dangerzone/issues/411)) - Platform support: Alpha integration with Qubes OS ([issue #411](https://github.com/freedomofpress/dangerzone/issues/411))
- Platform support: Debian Trixie (13)
### Removed ### Removed

View file

@ -778,6 +778,11 @@ class QADebianBookworm(QADebianBased):
VERSION = "bookworm" VERSION = "bookworm"
class QADebianTrixie(QADebianBased):
DISTRO = "debian"
VERSION = "trixie"
class QAUbuntu2004(QADebianBased): class QAUbuntu2004(QADebianBased):
DISTRO = "ubuntu" DISTRO = "ubuntu"
VERSION = "20.04" VERSION = "20.04"