From c6a765199aae4da0cdc8599d55bbddfa7e2248cc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 1 May 2020 16:52:51 +1000
Subject: [PATCH] gitlab-ci: update to ubuntu 20.04

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml        | 96 +++++++++++++++++++++----------------------
 .gitlab-ci/config.yml |  2 +-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc49e3f..ce25ef9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,18 +88,18 @@ variables:
     FDO_DISTRIBUTION_TAG: '2020-03-17.0'
     FDO_DISTRIBUTION_VERSION: '31'
 
+.ubuntu:20.04:
+  extends: .fdo.distribution-image@ubuntu
+  variables:
+    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_VERSION: '20.04'
+
 .ubuntu:19.10:
   extends: .fdo.distribution-image@ubuntu
   variables:
     FDO_DISTRIBUTION_TAG: '2020-03-17.0'
     FDO_DISTRIBUTION_VERSION: '19.10'
 
-.ubuntu:19.04:
-  extends: .fdo.distribution-image@ubuntu
-  variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '19.04'
-
 .debian:stable:
   extends: .fdo.distribution-image@debian
   variables:
@@ -305,6 +305,26 @@ fedora:31@container-forced-rebuild:
     FDO_FORCE_REBUILD: 1
 
 
+# Pulls in the container from upstream or rebuilds it if missing
+ubuntu:20.04@container-prep:
+  extends:
+    - .ubuntu:20.04
+    - .ubuntu.packages
+    - .fdo.container-build@ubuntu
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+# Always rebuilds the container
+ubuntu:20.04@container-forced-rebuild:
+  extends:
+    - ubuntu:20.04@container-prep
+  only:
+    - schedules
+  variables:
+    FDO_FORCE_REBUILD: 1
+
+
 # Pulls in the container from upstream or rebuilds it if missing
 ubuntu:19.10@container-prep:
   extends:
@@ -325,26 +345,6 @@ ubuntu:19.10@container-forced-rebuild:
     FDO_FORCE_REBUILD: 1
 
 
-# Pulls in the container from upstream or rebuilds it if missing
-ubuntu:19.04@container-prep:
-  extends:
-    - .ubuntu:19.04
-    - .ubuntu.packages
-    - .fdo.container-build@ubuntu
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-# Always rebuilds the container
-ubuntu:19.04@container-forced-rebuild:
-  extends:
-    - ubuntu:19.04@container-prep
-  only:
-    - schedules
-  variables:
-    FDO_FORCE_REBUILD: 1
-
-
 # Pulls in the container from upstream or rebuilds it if missing
 debian:stable@container-prep:
   extends:
@@ -510,6 +510,13 @@ fedora:31@container-clean:
     - .container-clean
   needs: ["fedora:31@container-prep"]
 
+### ubuntu 20.04
+ubuntu:20.04@container-clean:
+  extends:
+    - .ubuntu:20.04
+    - .container-clean
+  needs: ["ubuntu:20.04@container-prep"]
+
 ### ubuntu 19.10
 ubuntu:19.10@container-clean:
   extends:
@@ -517,13 +524,6 @@ ubuntu:19.10@container-clean:
     - .container-clean
   needs: ["ubuntu:19.10@container-prep"]
 
-### ubuntu 19.04
-ubuntu:19.04@container-clean:
-  extends:
-    - .ubuntu:19.04
-    - .container-clean
-  needs: ["ubuntu:19.04@container-prep"]
-
 ### debian stable
 debian:stable@container-clean:
   extends:
@@ -620,6 +620,21 @@ fedora:31@meson-build:
   needs: ['fedora:31@container-prep']
 
 
+ubuntu:20.04@autotools-build:
+  extends:
+    - .ubuntu:20.04
+    - .autotools-build@template
+  stage: autotools
+  needs: ['ubuntu:20.04@container-prep']
+
+ubuntu:20.04@meson-build:
+  extends:
+    - .ubuntu:20.04
+    - .meson-build@template
+  stage: meson
+  needs: ['ubuntu:20.04@container-prep']
+
+
 ubuntu:19.10@autotools-build:
   extends:
     - .ubuntu:19.10
@@ -635,21 +650,6 @@ ubuntu:19.10@meson-build:
   needs: ['ubuntu:19.10@container-prep']
 
 
-ubuntu:19.04@autotools-build:
-  extends:
-    - .ubuntu:19.04
-    - .autotools-build@template
-  stage: autotools
-  needs: ['ubuntu:19.04@container-prep']
-
-ubuntu:19.04@meson-build:
-  extends:
-    - .ubuntu:19.04
-    - .meson-build@template
-  stage: meson
-  needs: ['ubuntu:19.04@container-prep']
-
-
 debian:stable@autotools-build:
   extends:
     - .debian:stable
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index de31c40..5474fe3 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -32,8 +32,8 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
+      - '20.04'
       - '19.10'
-      - '19.04'
     packages:
       - git
       - gcc