From 7d0b6d44ba2508eca373ad1699ac7b799d90811c Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Mon, 16 Jan 2023 18:41:00 +0200
Subject: [PATCH] ci: Remove Fedora 35 support

Fedora 35 has reached its end of life [1], so we remove it from our CI
builds.

Closes #308

[1]: https://endoflife.date/fedora
---
 .circleci/config.yml | 51 +-------------------------------------------
 INSTALL.md           |  1 -
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index abb29ac..fff563d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -236,32 +236,6 @@ jobs:
             ./dev_scripts/env.py --distro fedora --version 36 run --dev \
                 bash -c 'cd dangerzone; poetry run make test'
 
-  ci-fedora-35:
-    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 35 build-dev
-
-      - run:
-          name: Run CI tests
-          command: |
-            ./dev_scripts/env.py --distro fedora --version 35 run --dev \
-                bash -c 'cd dangerzone; poetry run make test'
-
   ci-debian-bookworm:
     machine:
       image: ubuntu-2004:202111-01
@@ -366,20 +340,9 @@ jobs:
       - run: *copy-image
       - run: *build-rpm
 
-  build-fedora-35:
-    docker:
-      - image: fedora:35
-    resource_class: medium+
-    steps:
-      - run: *install-dependencies-rpm
-      - checkout
-      - restore_cache: *restore-cache
-      - run: *copy-image
-      - run: *build-rpm
-
   deploy-fedora:
     docker:
-      - image: fedora:35
+      - image: fedora:36
     resource_class: medium+
     steps:
       - run: *install-dependencies-rpm
@@ -406,12 +369,6 @@ jobs:
             PACKAGE_TYPE: "rpm"
             PACKAGECLOUD_DISTRO: "fedora/36"
           <<: *deploy-packagecloud
-      - run:
-          name: Deploy fedora/35
-          environment:
-            PACKAGE_TYPE: "rpm"
-            PACKAGECLOUD_DISTRO: "fedora/35"
-          <<: *deploy-packagecloud
 
   deploy-debian:
     docker:
@@ -499,9 +456,6 @@ workflows:
       - ci-fedora-36:
           requires:
             - build-container-image
-      - ci-fedora-35:
-          requires:
-            - build-container-image
       - build-ubuntu-kinetic:
           requires:
             - build-container-image
@@ -523,9 +477,6 @@ workflows:
       - build-fedora-36:
           requires:
             - build-container-image
-      - build-fedora-35:
-          requires:
-            - build-container-image
 
   build-and-deploy:
     jobs:
diff --git a/INSTALL.md b/INSTALL.md
index 8b97ddf..0debc08 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,7 +7,6 @@ Dangerzone is available for:
 - Debian 11 (bullseye)
 - Fedora 37
 - Fedora 36
-- Fedora 35
 
 ### Ubuntu, Debian