From d713ea005f3bbe6b42c94c1813d2dfac4fdcb1fc Mon Sep 17 00:00:00 2001
From: deeplow <deeplower@protonmail.com>
Date: Thu, 18 May 2023 13:15:55 +0100
Subject: [PATCH] Deprecate Fedora 36 support
Fixes #420
---
.circleci/config.yml | 43 -------------------------------------------
CHANGELOG.md | 7 +++++++
dev_scripts/qa.py | 4 ----
3 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6db6038f9..31b7cf0bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -273,32 +273,6 @@ jobs:
./dev_scripts/env.py --distro fedora --version 37 run --dev \
bash -c 'cd dangerzone; poetry run make test'
- ci-fedora-36:
- 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
- - restore_cache: *restore-cache
- - run: *copy-image
-
- - run:
- name: Prepare Dangerzone environment
- command: |
- ./dev_scripts/env.py --distro fedora --version 36 build-dev
-
- - run:
- name: Run CI tests
- command: |
- ./dev_scripts/env.py --distro fedora --version 36 run --dev \
- bash -c 'cd dangerzone; poetry run make test'
-
ci-debian-bookworm:
machine:
image: ubuntu-2004:202111-01
@@ -429,17 +403,6 @@ jobs:
- run: *copy-image
- run: *build-rpm
- build-fedora-36:
- docker:
- - image: fedora:36
- resource_class: medium+
- steps:
- - run: *install-dependencies-rpm
- - checkout
- - restore_cache: *restore-cache
- - run: *copy-image
- - run: *build-rpm
-
workflows:
version: 2
@@ -471,9 +434,6 @@ workflows:
- ci-fedora-37:
requires:
- build-container-image
- - ci-fedora-36:
- requires:
- - build-container-image
- build-ubuntu-kinetic:
requires:
- build-container-image
@@ -495,6 +455,3 @@ workflows:
- build-fedora-37:
requires:
- build-container-image
- - build-fedora-36:
- requires:
- - build-container-image
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73abee5b7..7d2b6fcd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
## [Unreleased]
+### Added
+
+### Removed
+- Platform support: Drop Fedora 36, since it's end-of-life ([issues #420](https://github.com/freedomofpress/dangerzone/issues/420))
+
+### Fixed
+
### Security
- Continuously scan our Python dependencies and container image for
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 9d229acb0..6c4e74fa0 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -810,10 +810,6 @@ def build_package(self):
)
-class QAFedora36(QAFedora):
- VERSION = "36"
-
-
class QAFedora37(QAFedora):
VERSION = "37"