From 62ee9db10ebc1d8da46c37666d472af017fd540f Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Thu, 29 Oct 2020 17:13:06 -0700
Subject: [PATCH] Remove bionic, fix groovy, and comment out fedora 33

---
 .circleci/config.yml | 46 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d015834..7db0a49 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,30 +1,6 @@
 version: 2.1
 
 jobs:
-  build-ubuntu-bionic:
-    docker:
-      - image: ubuntu:18.04
-    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/bionic deb_dist/dangerzone_${VERSION}-1_all.deb
-            package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/dangerzone_${VERSION}-1.dsc
-
   build-ubuntu-eoan:
     docker:
       - image: ubuntu:19.10
@@ -96,8 +72,8 @@ jobs:
           name: Deploy to packagecloud.io
           command: |
             VERSION=$(cat dangerzone/__init__.py |grep "dangerzone_version = " |cut -d '"' -f2)
-            package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1_all.deb
-            package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1.dsc
+            package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/dangerzone_${VERSION}-1_all.deb
+            package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/dangerzone_${VERSION}-1.dsc
 
   build-debian-buster:
     docker:
@@ -217,12 +193,6 @@ workflows:
   version: 2
   build-tags:
     jobs:
-      - build-ubuntu-bionic:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
       - build-ubuntu-eoan:
           filters:
             tags:
@@ -265,9 +235,9 @@ workflows:
               only: /^v.*/
             branches:
               ignore: /.*/
-      - build-fedora-33:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
+      # - build-fedora-33:
+      #     filters:
+      #       tags:
+      #         only: /^v.*/
+      #       branches:
+      #         ignore: /.*/