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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ jobs:
version: trixie
- distro: debian
version: forky
- distro: fedora
version: "41"
- distro: fedora
version: "42"
- distro: fedora
version: "43"
- distro: fedora
version: "44"

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ jobs:
strategy:
matrix:
include:
- distro: fedora
version: 41
- distro: fedora
version: 42
- distro: fedora
version: 43
- distro: fedora
version: 44
steps:
- name: Add packages.freedom.press to our YUM sources
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ jobs:
strategy:
matrix:
distro: ["fedora"]
version: ["41", "42", "43"]
version: ["42", "43", "44"]
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -440,12 +440,12 @@ jobs:
version: trixie
- distro: debian
version: forky
- distro: fedora
version: "41"
- distro: fedora
version: "42"
- distro: fedora
version: "43"
- distro: fedora
version: "44"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ The following instructions require typing commands in a terminal in dom0.
qvm-clone fedora-42 fedora-42-dz
```

> :bulb: Alternatively, you can use your base Fedora 41 template in the
> :bulb: Alternatively, you can use your base Fedora 42 template in the
> following instructions. In that case, skip this step and replace
> `fedora-42-dz` with `fedora-42` in the steps below.

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or

- Add a deprecation warning for Windows 10
([#1357](https://github.com/freedomofpress/dangerzone/issues/1357))
- Add support for Fedora 44
([#1462](https://github.com/freedomofpress/dangerzone/issues/1462))
- Drop support for Fedora 41 as it has reached end of life

### Development changes

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Dangerzone is available for:
- Debian 13 (trixie)
- Debian 12 (bookworm)
- Debian 11 (bullseye), support will be dropped in future releases.
- Fedora 44
- Fedora 43
- Fedora 42
- Fedora 41
- Tails
- Qubes OS (beta support)

Expand Down
12 changes: 6 additions & 6 deletions dev_scripts/qa.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- [ ] 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 41 as of
- [ ] Create a test build in the most recent Fedora platform (Fedora 44 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
Expand All @@ -85,7 +85,7 @@
- [ ] Run the Dangerzone tests.
- [ ] Create an .rpm package and install it system-wide.
- [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 41 as
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 44 as
of writing this) and make sure it works:
- [ ] Create a new development environment with Poetry.
- [ ] Run the Dangerzone tests.
Expand Down Expand Up @@ -996,6 +996,10 @@ def build_package(self):
)


class QAFedora44(QAFedora):
VERSION = "44"


class QAFedora43(QAFedora):
VERSION = "43"

Expand All @@ -1004,10 +1008,6 @@ class QAFedora42(QAFedora):
VERSION = "42"


class QAFedora41(QAFedora):
VERSION = "41"


def parse_args():
parser = argparse.ArgumentParser(
prog=sys.argv[0],
Expand Down
10 changes: 5 additions & 5 deletions docs/developer/release/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,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, Fedora 41 is used as an example.
> In this section, Fedora 42 is used as an example.

Create a Fedora development environment. [Follow the
instructions in the build section](https://github.com/freedomofpress/dangerzone/blob/main/BUILD.md#fedora),
or create it locally with:

```bash
./dev_scripts/env.py --distro fedora --version 41 build-dev
./dev_scripts/env.py --distro fedora --version 41 run --dev bash
./dev_scripts/env.py --distro fedora --version 42 build-dev
./dev_scripts/env.py --distro fedora --version 42 run --dev bash

# Get the vendorized assets
poetry run mazette install
Expand All @@ -174,7 +174,7 @@ poetry run dangerzone-image prepare-archive
--output share/container.tar

# Create a .rpm:
./dev_scripts/env.py --distro fedora --version 41 run --dev bash -c "cd dangerzone && ./install/linux/build-rpm.py"
./dev_scripts/env.py --distro fedora --version 42 run --dev bash -c "cd dangerzone && ./install/linux/build-rpm.py"
```

Publish the .rpm under `./dist` to the
Expand All @@ -185,7 +185,7 @@ Publish the .rpm under `./dist` to the
Create a `.rpm` for Qubes:

```sh
./dev_scripts/env.py --distro fedora --version 41 run --dev bash -c "cd dangerzone && ./install/linux/build-rpm.py --qubes"
./dev_scripts/env.py --distro fedora --version 42 run --dev bash -c "cd dangerzone && ./install/linux/build-rpm.py --qubes"
```

and similarly publish it to the [`freedomofpress/yum-tools-prod`](https://github.com/freedomofpress/yum-tools-prod) repo.
4 changes: 2 additions & 2 deletions docs/developer/release/qa.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ prior to a release (see [Large Document Testing](#large-document-testing)).
- [ ] 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 41 as of
- [ ] Create a test build in the most recent Fedora platform (Fedora 44 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
Expand All @@ -66,7 +66,7 @@ prior to a release (see [Large Document Testing](#large-document-testing)).
- [ ] Run the Dangerzone tests.
- [ ] Create an .rpm package and install it system-wide.
- [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 41 as
- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 44 as
of writing this) and make sure it works:
- [ ] Create a new development environment with Poetry.
- [ ] Run the Dangerzone tests.
Expand Down
2 changes: 1 addition & 1 deletion dodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

ARCH = "arm64" if platform.machine() == "arm64" else "i686"
VERSION = open("share/version.txt").read().strip()
FEDORA_VERSIONS = ["41", "42", "43"]
FEDORA_VERSIONS = ["42", "43", "44"]

### Global parameters

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ python = ">=3.9,<3.15"
click = "*"
platformdirs = "*"
PySide6 = "^6.7.1"
PyMuPDF = "^1.25.3" # The version in Fedora 41
PyMuPDF = "^1.25.3" # The version in Fedora 42
colorama = "*"
pyxdg = { version = "*", platform = "linux" }
requests = "*"
Expand Down
Loading