From c2b1fda4e7502c82b1b53fc5cbd8fba22e793d0c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 7 Aug 2020 14:59:27 -0400
Subject: [PATCH] Add Ubuntu 20.04

---
 .circleci/config.yml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0f596fc7..dae9e904e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,10 +11,13 @@ workflows:
           requires:
             - "debian-9"
 
-      - "ubuntu-18.04"
+      - "ubuntu-20.04"
+      - "ubuntu-18.04":
+          requires:
+            - "ubuntu-20.04"
       - "ubuntu-16.04":
           requires:
-            - "ubuntu-18.04"
+            - "ubuntu-20.04"
 
       - "fedora-29"
       - "fedora-28":
@@ -65,6 +68,7 @@ workflows:
       - "build-image-debian-9"
       - "build-image-ubuntu-16.04"
       - "build-image-ubuntu-18.04"
+      - "build-image-ubuntu-20.04"
       - "build-image-fedora-28"
       - "build-image-fedora-29"
       - "build-image-centos-8"
@@ -268,6 +272,13 @@ jobs:
         user: "nobody"
 
 
+  ubuntu-20.04:
+    <<: *DEBIAN
+    docker:
+      - image: "tahoelafsci/ubuntu:20.04"
+        user: "nobody"
+
+
   centos-8: &RHEL_DERIV
     docker:
       - image: "tahoelafsci/centos:8"
@@ -480,6 +491,14 @@ jobs:
       TAG: "18.04"
 
 
+  build-image-ubuntu-20.04:
+    <<: *BUILD_IMAGE
+
+    environment:
+      DISTRO: "ubuntu"
+      TAG: "20.04"
+
+
   build-image-centos-8:
     <<: *BUILD_IMAGE