summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2020-04-18 15:07:10 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2020-04-18 05:17:52 +0000
commit58cf854124a269688b6e36e157a984046b0843ee (patch)
tree402fcd39a437a2f608d68b7a05d9304b1c413170
parentd107d58cd25c0e322d3d0a7d68feddcdb9e5e58f (diff)
downloadlibinput-58cf854124a269688b6e36e157a984046b0843ee.tar.gz
gitlab CI: Ubuntu 19.04 is EOL, drop it
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml34
-rw-r--r--.gitlab-ci/config.yml1
2 files changed, 0 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 278af6b3..86fc8596 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,18 +244,6 @@ ubuntu:19.10@container-prep:
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-ubuntu:19.04@container-prep:
- extends:
- - .fdo.container-build@ubuntu
- - .policy
- - .rebuild_for_schedule
- stage: prep
- variables:
- GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '19.04'
- FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
arch:rolling@container-prep:
extends:
- .fdo.container-build@arch
@@ -408,16 +396,6 @@ ubuntu:19.10@container-clean:
FDO_DISTRIBUTION_VERSION: '19.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-ubuntu:19.04@container-clean:
- extends:
- - .container-clean
- variables:
- GIT_STRATEGY: none
- UBUNTU_VERSION: '19.04'
- CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '19.04'
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
arch:rolling@container-clean:
extends:
- .container-clean
@@ -835,18 +813,6 @@ ubuntu:19.10@default-build:
- "ubuntu:19.10@container-prep"
-ubuntu:19.04@default-build:
- stage: distro
- extends:
- - .build@template
- - .fdo.distribution-image@ubuntu
- variables:
- FDO_DISTRIBUTION_VERSION: '19.04'
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
- needs:
- - "ubuntu:19.04@container-prep"
-
-
arch:rolling@default-build:
stage: distro
extends:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 00fc5b6d..020354d3 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -18,7 +18,6 @@ distributions:
tag: *default_tag
versions:
- '19.10'
- - '19.04'
- name: arch
tag: *default_tag
versions: