Deprecate Fedora 36 support

Fixes #420
freedomofpress · May 22, 2023 · d713ea0 · d713ea0
1 parent 3d822e1
commit d713ea0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 47 deletions.
diff --git 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
@@ -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
@@ -810,10 +810,6 @@ def build_package(self):
         )
 
 
-class QAFedora36(QAFedora):
-    VERSION = "36"
-
-
 class QAFedora37(QAFedora):
     VERSION = "37"