fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-24 13:30:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: switch to Ubuntu 21.04

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-04-23 09:28:36 +10:00
parent a37d6dcc9c
commit 72f747f255
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
.gitlab-ci.yml
View file

@ -225,17 +225,6 @@ debian:stable@container-prep:
FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:20.04@container-prep:
extends:
- .fdo.container-build@ubuntu
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:20.10@container-prep: ubuntu:20.10@container-prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
@ -247,6 +236,17 @@ ubuntu:20.10@container-prep:
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:21.04@container-prep:
extends:
- .fdo.container-build@ubuntu
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
arch:rolling@container-prep: arch:rolling@container-prep:
extends: extends:
- .fdo.container-build@arch - .fdo.container-build@arch
@ -380,15 +380,6 @@ debian:stable@container-clean:
FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_VERSION: 'stable'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:20.04@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:20.10@container-clean: ubuntu:20.10@container-clean:
extends: extends:
- .container-clean - .container-clean
@ -398,6 +389,15 @@ ubuntu:20.10@container-clean:
FDO_DISTRIBUTION_VERSION: '20.10' FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:21.04@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
arch:rolling@container-clean: arch:rolling@container-clean:
extends: extends:
- .container-clean - .container-clean
@ -953,18 +953,6 @@ debian:stable@default-build:
- "debian:stable@container-prep" - "debian:stable@container-prep"
ubuntu:20.04@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@ubuntu
variables:
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "ubuntu:20.04@container-prep"
ubuntu:20.10@default-build: ubuntu:20.10@default-build:
stage: distro stage: distro
extends: extends:
@ -977,6 +965,18 @@ ubuntu:20.10@default-build:
- "ubuntu:20.10@container-prep" - "ubuntu:20.10@container-prep"
ubuntu:21.04@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@ubuntu
variables:
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "ubuntu:21.04@container-prep"
arch:rolling@default-build: arch:rolling@default-build:
stage: distro stage: distro
extends: extends:

2
.gitlab-ci/config.yml
View file

@ -63,8 +63,8 @@ distributions:
- name: ubuntu - name: ubuntu
tag: *default_tag tag: *default_tag
versions: versions:
- '20.04'
- '20.10' - '20.10'
- '21.04'
packages: packages:
- git - git
- gcc - gcc