gitlab-ci: update to ubuntu 20.04
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
1 parent
521edcba27
commit
c6a765199a
2 files changed
+49
-49
No files matched your search
+48
-48
@@ -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
|
||||
|
||||
@@ -32,8 +32,8 @@ distributions:
|
||||
- name: ubuntu
|
||||
tag: *default_tag
|
||||
versions:
|
||||
- '20.04'
|
||||
- '19.10'
|
||||
- '19.04'
|
||||
packages:
|
||||
- git
|
||||
- gcc
|
||||
|
||||
Reference in new issue
Block a user