mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-29 10:12:38 +02:00
parent
418b68d4ca
commit
c7ba9ee75c
6 changed files with 10 additions and 55 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -49,6 +49,8 @@ jobs:
|
||||||
version: "40"
|
version: "40"
|
||||||
- distro: fedora
|
- distro: fedora
|
||||||
version: "41"
|
version: "41"
|
||||||
|
- distro: fedora
|
||||||
|
version: "42"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -306,7 +306,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
distro: ["fedora"]
|
distro: ["fedora"]
|
||||||
version: ["40", "41"]
|
version: ["40", "41", "42"]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
@ -395,6 +395,8 @@ jobs:
|
||||||
version: "40"
|
version: "40"
|
||||||
- distro: fedora
|
- distro: fedora
|
||||||
version: "41"
|
version: "41"
|
||||||
|
- distro: fedora
|
||||||
|
version: "42"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
22
BUILD.md
22
BUILD.md
|
@ -109,28 +109,6 @@ sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
|
||||||
pipx qt6-qtbase-gui
|
pipx qt6-qtbase-gui
|
||||||
```
|
```
|
||||||
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<details>
|
|
||||||
<summary><i>:memo: Expand this section if you are on Fedora 41.</i></summary>
|
|
||||||
</br>
|
|
||||||
|
|
||||||
The default Python version that ships with Fedora 41 (3.13) is not
|
|
||||||
compatible with PySide6, which requires Python 3.12 or earlier.
|
|
||||||
|
|
||||||
You can install Python 3.12 using the `python3.12` package.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo dnf install -y python3.12
|
|
||||||
```
|
|
||||||
|
|
||||||
Poetry will automatically pick up the correct version when running.
|
|
||||||
</details>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
Install Poetry using `pipx`:
|
Install Poetry using `pipx`:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
|
|
@ -8,6 +8,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
|
||||||
## [Unreleased](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...HEAD)
|
## [Unreleased](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...HEAD)
|
||||||
|
|
||||||
- Platform support: Drop support for Ubuntu Focal, since it's nearing end-of-life ([#1018](https://github.com/freedomofpress/dangerzone/issues/1018))
|
- Platform support: Drop support for Ubuntu Focal, since it's nearing end-of-life ([#1018](https://github.com/freedomofpress/dangerzone/issues/1018))
|
||||||
|
- Platform support: Add support for Fedora 42 ([#1091](https://github.com/freedomofpress/dangerzone/issues/1091))
|
||||||
|
|
||||||
## [0.8.1](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...0.8.0)
|
## [0.8.1](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...0.8.0)
|
||||||
|
|
||||||
|
|
|
@ -103,14 +103,6 @@ RUN apt-get update \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# NOTE: Fedora 41 comes with Python 3.13 installed. Our Python project is not compatible
|
|
||||||
# yet with Python 3.13, because PySide6 cannot work with this Python version. To
|
|
||||||
# sidestep this, install Python 3.12 *only* in dev environments.
|
|
||||||
DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS = r"""
|
|
||||||
# Install Python 3.12 since our project is not compatible yet with Python 3.13.
|
|
||||||
RUN dnf install -y python3.12
|
|
||||||
"""
|
|
||||||
|
|
||||||
# FIXME: Install Poetry on Fedora via package manager.
|
# FIXME: Install Poetry on Fedora via package manager.
|
||||||
DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
|
DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
|
||||||
RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
|
RUN dnf install -y git rpm-build podman python3 python3-devel python3-poetry-core \
|
||||||
|
@ -538,8 +530,6 @@ class Env:
|
||||||
|
|
||||||
if self.distro == "fedora":
|
if self.distro == "fedora":
|
||||||
install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
|
install_deps = DOCKERFILE_BUILD_DEV_FEDORA_DEPS
|
||||||
if self.version == "41":
|
|
||||||
install_deps += DOCKERFILE_BUILD_DEV_FEDORA_41_DEPS
|
|
||||||
else:
|
else:
|
||||||
# Use Qt6 in all of our Linux dev environments, and add a missing
|
# Use Qt6 in all of our Linux dev environments, and add a missing
|
||||||
# libxcb-cursor0 dependency
|
# libxcb-cursor0 dependency
|
||||||
|
|
|
@ -327,28 +327,6 @@ sudo dnf install -y rpm-build podman python3 python3-devel python3-poetry-core \
|
||||||
pipx qt6-qtbase-gui
|
pipx qt6-qtbase-gui
|
||||||
```
|
```
|
||||||
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<details>
|
|
||||||
<summary><i>:memo: Expand this section if you are on Fedora 41.</i></summary>
|
|
||||||
</br>
|
|
||||||
|
|
||||||
The default Python version that ships with Fedora 41 (3.13) is not
|
|
||||||
compatible with PySide6, which requires Python 3.12 or earlier.
|
|
||||||
|
|
||||||
You can install Python 3.12 using the `python3.12` package.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo dnf install -y python3.12
|
|
||||||
```
|
|
||||||
|
|
||||||
Poetry will automatically pick up the correct version when running.
|
|
||||||
</details>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
Install Poetry using `pipx`:
|
Install Poetry using `pipx`:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
@ -1044,6 +1022,10 @@ class QAFedora(QALinux):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class QAFedora42(QAFedora):
|
||||||
|
VERSION = "42"
|
||||||
|
|
||||||
|
|
||||||
class QAFedora41(QAFedora):
|
class QAFedora41(QAFedora):
|
||||||
VERSION = "41"
|
VERSION = "41"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue