From 94507d4e1375cf4727e53e07cadf99114396482c Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Fri, 25 Sep 2020 14:23:34 -0700
Subject: [PATCH] Remove ubuntu 19.04 from circleci, and update gem to use
 newer flags for ubuntu 20.04 and debian bullseye

---
 .circleci/config.yml | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 018614f..267d185 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,6 @@
 version: 2.1
 
 jobs:
-
   build-ubuntu-bionic:
     docker:
       - image: ubuntu:18.04
@@ -26,30 +25,6 @@ jobs:
             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-disco:
-    docker:
-      - image: ubuntu:19.04
-    steps:
-      - run:
-          name: Install dependencies
-          command: |
-            apt-get update
-            apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg
-            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/disco deb_dist/dangerzone_${VERSION}-1_all.deb
-            package_cloud push firstlookmedia/code/ubuntu/disco deb_dist/dangerzone_${VERSION}-1.dsc
-
   build-ubuntu-eoan:
     docker:
       - image: ubuntu:19.10
@@ -84,8 +59,8 @@ jobs:
             export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
             apt-get update
             apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg
-            gem install --no-ri --no-rdoc rake
-            gem install --no-ri --no-rdoc package_cloud
+            gem install -N rake
+            gem install -N package_cloud
       - checkout
       - run:
           name: Create the .deb package
@@ -132,8 +107,8 @@ jobs:
           command: |
             apt-get update
             apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg
-            gem install --no-ri --no-rdoc rake
-            gem install --no-ri --no-rdoc package_cloud
+            gem install -N rake
+            gem install -N package_cloud
       - checkout
       - run:
           name: Create the .deb package
@@ -201,12 +176,6 @@ workflows:
               only: /^v.*/
             branches:
               ignore: /.*/
-      - build-ubuntu-disco:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
       - build-ubuntu-eoan:
           filters:
             tags: