summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2022-08-03 13:42:47 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2022-08-03 13:43:32 +1000
commit45db4ceb491824f6bb4ffecb7297cde3cf17d79b (patch)
tree713e63f8995ad57768f4344b3ef78ec8cf3d8206
parent187ec90bb26de4a8ee0cd698f3aa369c2b73f9fa (diff)
downloadlibinput-45db4ceb491824f6bb4ffecb7297cde3cf17d79b.tar.gz
gitlab ci: drop EOL'd ubuntu 21.10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml33
-rw-r--r--.gitlab-ci/config.yml1
2 files changed, 0 insertions, 34 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58faa7d5..886874cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,17 +269,6 @@ debian:stable@container-prep:
FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
-ubuntu:21.10@container-prep:
- extends:
- - .fdo.container-build@ubuntu
- - .policy
- stage: prep
- variables:
- GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '21.10'
- FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
ubuntu:22.04@container-prep:
extends:
- .fdo.container-build@ubuntu
@@ -375,16 +364,6 @@ debian:stable@container-clean:
FDO_DISTRIBUTION_VERSION: 'stable'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
-ubuntu:21.10@container-clean:
- extends:
- - .policy
- - .container-clean
- variables:
- GIT_STRATEGY: none
- CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '21.10'
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
ubuntu:22.04@container-clean:
extends:
- .policy
@@ -951,18 +930,6 @@ debian:stable@default-build:
- "debian:stable@container-prep"
-ubuntu:21.10@default-build:
- stage: distro
- extends:
- - .build@template
- - .fdo.distribution-image@ubuntu
- variables:
- FDO_DISTRIBUTION_VERSION: '21.10'
- FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
- needs:
- - "ubuntu:21.10@container-prep"
-
-
ubuntu:22.04@default-build:
stage: distro
extends:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index f5ddf8ee..17446b80 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -65,7 +65,6 @@ distributions:
- name: ubuntu
tag: *default_tag
versions:
- - '21.10'
- '22.04'
packages:
- git