From af19df70fda36af9e16e0b65cb6f6686efe88dc0 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Mon, 4 Jan 2021 15:43:43 -0800
Subject: [PATCH] Remove ubuntu eoan, add fedora 33

---
 .circleci/config.yml | 54 ++++++++++----------------------------------
 CHANGELOG.md         |  1 +
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2ea44d2..d5c0d30 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,30 +1,6 @@
 version: 2.1
 
 jobs:
-  build-ubuntu-eoan:
-    docker:
-      - image: ubuntu:19.10
-    steps:
-      - run:
-          name: Install dependencies
-          command: |
-            apt-get update
-            apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
-            gem install --no-ri --no-rdoc rake
-            gem install --no-ri --no-rdoc package_cloud
-      - checkout
-      - run:
-          name: Create the .deb package
-          command: |
-            ./install/linux/build_deb.py
-            dpkg -i deb_dist/dangerzone_*-1_all.deb
-      - run:
-          name: Deploy to packagecloud.io
-          command: |
-            VERSION=$(cat dangerzone/__init__.py |grep "dangerzone_version = " |cut -d '"' -f2)
-            package_cloud push firstlookmedia/code/ubuntu/eoan deb_dist/dangerzone_${VERSION}-1_all.deb
-            package_cloud push firstlookmedia/code/ubuntu/eoan deb_dist/dangerzone_${VERSION}-1.dsc
-
   build-ubuntu-focal:
     docker:
       - image: ubuntu:20.04
@@ -193,24 +169,18 @@ workflows:
   version: 2
   build-tags:
     jobs:
-      - build-ubuntu-eoan:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
       - build-ubuntu-focal:
           filters:
             tags:
               only: /^v.*/
             branches:
               ignore: /.*/
-      # - build-ubuntu-groovy:
-      #     filters:
-      #       tags:
-      #         only: /^v.*/
-      #       branches:
-      #         ignore: /.*/
+      - build-ubuntu-groovy:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
       - build-debian-buster:
           filters:
             tags:
@@ -235,9 +205,9 @@ workflows:
               only: /^v.*/
             branches:
               ignore: /.*/
-      # - build-fedora-33:
-      #     filters:
-      #       tags:
-      #         only: /^v.*/
-      #       branches:
-      #         ignore: /.*/
+      - build-fedora-33:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d006c16..affa7c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Dangerzone 0.1.5
 
 - Add support for macOS Big Sur
+- Drop support for Ubuntu 19.10, add support for Fedora 33
 
 ## Dangerzone 0.1.4