diff --git a/.circleci/config.yml b/.circleci/config.yml index c10be97..52ee02d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -273,6 +273,33 @@ jobs: ./dev_scripts/env.py --distro ubuntu --version 20.04 run --dev \ bash -c 'cd dangerzone; poetry run make test' + ci-fedora-39: + 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 fedora --version 39 build-dev + + - run: + name: Run CI tests + command: | + ./dev_scripts/env.py --distro fedora --version 39 run --dev \ + bash -c 'cd dangerzone; poetry run make test' + ci-fedora-38: machine: image: ubuntu-2004:202111-01 @@ -499,6 +526,19 @@ jobs: - run: *copy-image - run: *build-deb + build-fedora-39: + docker: + - image: fedora:39 + resource_class: medium+ + steps: + - run: *install-dependencies-rpm + - checkout + - run: *calculate-cache-key + - restore_cache: *restore-cache + - run: *copy-image + - run: *build-rpm + - run: *build-rpm-qubes + build-fedora-38: docker: - image: fedora:38 @@ -544,6 +584,9 @@ workflows: - ci-debian-bullseye: requires: - build-container-image + - ci-fedora-39: + requires: + - build-container-image - ci-fedora-38: requires: - build-container-image @@ -568,6 +611,9 @@ workflows: - build-debian-bookworm: requires: - build-container-image + - build-fedora-39: + requires: + - build-container-image - build-fedora-38: requires: - build-container-image diff --git a/CHANGELOG.md b/CHANGELOG.md index ffd8cce..91a8f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,12 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or ## Unreleased +### Added + +- Platform support: Fedora 39 ([issue #606](https://github.com/freedomofpress/dangerzone/issues/606)) + ## Fixed + - Fix mismatched between between original document and converted one ([issue #626](https://github.com/freedomofpress/dangerzone/issues/)). This does not affect the quality of the final document. - Capitalize "dangerzone" on the application as well as on the Linux desktop shortcut, thanks to [@sudwhiwdh](https://github.com/sudwhiwdh) diff --git a/INSTALL.md b/INSTALL.md index 6b62759..d619182 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -16,6 +16,7 @@ Dangerzone is available for: - Debian 13 (trixie) - Debian 12 (bookworm) - Debian 11 (bullseye) +- Fedora 39 - Fedora 38 - Qubes OS (beta support) diff --git a/RELEASE.md b/RELEASE.md index 6ed60e2..f564a17 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -72,7 +72,7 @@ and newer platforms, we have to do the following: - [ ] Run the Dangerzone tests. - [ ] Create a .deb package and install it system-wide. - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below). -- [ ] Create a test build in the most recent Fedora platform (Fedora 38 as of +- [ ] Create a test build in the most recent Fedora platform (Fedora 39 as of writing this) and make sure it works: - [ ] Create a new development environment with Poetry. - [ ] Build the container image and ensure the development environment uses @@ -326,15 +326,15 @@ repo, by sending a PR. Follow the instructions in that repo on how to do so. > **NOTE**: This procedure will have to be done for every supported Fedora version. > -> In this section, we'll use Fedora 38 as an example. +> In this section, we'll use Fedora 39 as an example. Create a Fedora development environment. You can [follow the instructions in our build section](https://github.com/freedomofpress/dangerzone/blob/main/BUILD.md#fedora), or create your own locally with: ```sh -./dev_scripts/env.py --distro fedora --version 38 build-dev -./dev_scripts/env.py --distro fedora --version 38 run --dev bash +./dev_scripts/env.py --distro fedora --version 39 build-dev +./dev_scripts/env.py --distro fedora --version 39 run --dev bash cd dangerzone ``` diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index b1c03a9..0dc3b11 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -54,7 +54,7 @@ and newer platforms, we have to do the following: - [ ] Run the Dangerzone tests. - [ ] Create a .deb package and install it system-wide. - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below). -- [ ] Create a test build in the most recent Fedora platform (Fedora 38 as of +- [ ] Create a test build in the most recent Fedora platform (Fedora 39 as of writing this) and make sure it works: - [ ] Create a new development environment with Poetry. - [ ] Build the container image and ensure the development environment uses @@ -895,6 +895,10 @@ class QAFedora(QALinux): ) +class QAFedora39(QAFedora): + VERSION = "39" + + class QAFedora38(QAFedora): VERSION = "38"