gitlab-ci: update to ubuntu 20.04

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc49e3f15c5a87e414406ea4b1c5817843f4294b..ce25ef90575d0b3c4d2bc08d85c51721b3797f3b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,17 +88,17 @@ variables:
     FDO_DISTRIBUTION_TAG: '2020-03-17.0'
     FDO_DISTRIBUTION_VERSION: '31'
 
-.ubuntu:19.10:
+.ubuntu:20.04:
   extends: .fdo.distribution-image@ubuntu
   variables:
     FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '19.10'
+    FDO_DISTRIBUTION_VERSION: '20.04'
 
-.ubuntu:19.04:
+.ubuntu:19.10:
   extends: .fdo.distribution-image@ubuntu
   variables:
     FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '19.04'
+    FDO_DISTRIBUTION_VERSION: '19.10'
 
 .debian:stable:
   extends: .fdo.distribution-image@debian
@@ -306,9 +306,9 @@ fedora:31@container-forced-rebuild:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-ubuntu:19.10@container-prep:
+ubuntu:20.04@container-prep:
   extends:
-    - .ubuntu:19.10
+    - .ubuntu:20.04
     - .ubuntu.packages
     - .fdo.container-build@ubuntu
   stage: prep
@@ -316,9 +316,9 @@ ubuntu:19.10@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-ubuntu:19.10@container-forced-rebuild:
+ubuntu:20.04@container-forced-rebuild:
   extends:
-    - ubuntu:19.10@container-prep
+    - ubuntu:20.04@container-prep
   only:
     - schedules
   variables:
@@ -326,9 +326,9 @@ ubuntu:19.10@container-forced-rebuild:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-ubuntu:19.04@container-prep:
+ubuntu:19.10@container-prep:
   extends:
-    - .ubuntu:19.04
+    - .ubuntu:19.10
     - .ubuntu.packages
     - .fdo.container-build@ubuntu
   stage: prep
@@ -336,9 +336,9 @@ ubuntu:19.04@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-ubuntu:19.04@container-forced-rebuild:
+ubuntu:19.10@container-forced-rebuild:
   extends:
-    - ubuntu:19.04@container-prep
+    - ubuntu:19.10@container-prep
   only:
     - schedules
   variables:
@@ -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,34 +620,34 @@ fedora:31@meson-build:
   needs: ['fedora:31@container-prep']
 
 
-ubuntu:19.10@autotools-build:
+ubuntu:20.04@autotools-build:
   extends:
-    - .ubuntu:19.10
+    - .ubuntu:20.04
     - .autotools-build@template
   stage: autotools
-  needs: ['ubuntu:19.10@container-prep']
+  needs: ['ubuntu:20.04@container-prep']
 
-ubuntu:19.10@meson-build:
+ubuntu:20.04@meson-build:
   extends:
-    - .ubuntu:19.10
+    - .ubuntu:20.04
     - .meson-build@template
   stage: meson
-  needs: ['ubuntu:19.10@container-prep']
+  needs: ['ubuntu:20.04@container-prep']
 
 
-ubuntu:19.04@autotools-build:
+ubuntu:19.10@autotools-build:
   extends:
-    - .ubuntu:19.04
+    - .ubuntu:19.10
     - .autotools-build@template
   stage: autotools
-  needs: ['ubuntu:19.04@container-prep']
+  needs: ['ubuntu:19.10@container-prep']
 
-ubuntu:19.04@meson-build:
+ubuntu:19.10@meson-build:
   extends:
-    - .ubuntu:19.04
+    - .ubuntu:19.10
     - .meson-build@template
   stage: meson
-  needs: ['ubuntu:19.04@container-prep']
+  needs: ['ubuntu:19.10@container-prep']
 
 
 debian:stable@autotools-build:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index de31c4078b38a4e79560688693db047357a86432..5474fe3a0849d3388434c0497a1871a790d4b2f7 100644 (file)
--- 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