fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-05-07 10:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: bump to Fedora 34 and Ubuntu 21.04

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-05-19 10:17:10 +10:00
parent a53c6d1154
commit bb1cd0dd57
2 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
.gitlab-ci.yml
View file

@ -80,61 +80,61 @@ variables:
.fedora:33: .fedora:33:
extends: .fdo.distribution-image@fedora extends: .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '33'
.fedora:32: .fedora:34:
extends: .fdo.distribution-image@fedora extends: .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_VERSION: '34'
.ubuntu:20.04: .ubuntu:21.04:
extends: .fdo.distribution-image@ubuntu extends: .fdo.distribution-image@ubuntu
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '20.04' FDO_DISTRIBUTION_VERSION: '21.04'
.ubuntu:20.10: .ubuntu:20.10:
extends: .fdo.distribution-image@ubuntu extends: .fdo.distribution-image@ubuntu
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '20.10' FDO_DISTRIBUTION_VERSION: '20.10'
.debian:stable: .debian:stable:
extends: .fdo.distribution-image@debian extends: .fdo.distribution-image@debian
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_VERSION: 'stable'
.debian:sid: .debian:sid:
extends: .fdo.distribution-image@debian extends: .fdo.distribution-image@debian
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_VERSION: 'sid'
.centos:7: .centos:7:
extends: .fdo.distribution-image@centos extends: .fdo.distribution-image@centos
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '7' FDO_DISTRIBUTION_VERSION: '7'
.centos:8: .centos:8:
extends: .fdo.distribution-image@centos extends: .fdo.distribution-image@centos
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: '8' FDO_DISTRIBUTION_VERSION: '8'
.arch:rolling: .arch:rolling:
extends: .fdo.distribution-image@arch extends: .fdo.distribution-image@arch
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_VERSION: 'rolling'
.alpine:latest: .alpine:latest:
extends: .fdo.distribution-image@alpine extends: .fdo.distribution-image@alpine
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-01-04.1' FDO_DISTRIBUTION_TAG: '2021-05-19.1'
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
@ -226,9 +226,9 @@ check-merge-request:
# Pulls in the qemu container from upstream or rebuilds it if missing # Pulls in the qemu container from upstream or rebuilds it if missing
.fedora:32@qemu-prep: .fedora:34@qemu-prep:
extends: extends:
- .fedora:32 - .fedora:34
- .fedora.packages - .fedora.packages
- .fdo.qemu-build@fedora - .fdo.qemu-build@fedora
stage: prep stage: prep
@ -236,24 +236,24 @@ check-merge-request:
- kvm - kvm
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_TAG: qemu-2021-01-04.1 FDO_DISTRIBUTION_TAG: qemu-2021-05-19.1
allow_failure: true allow_failure: true
# Always rebuilds the container # Always rebuilds the container
.fedora:32@qemu-forced-rebuild: .fedora:34@qemu-forced-rebuild:
extends: extends:
- .fedora:32@qemu-prep - .fedora:34@qemu-prep
variables: variables:
FDO_FORCE_REBUILD: 1 FDO_FORCE_REBUILD: 1
only: only:
- schedules - schedules
# This is the actual job # This is the actual job
fedora:32@qemu-prep: fedora:34@qemu-prep:
extends: .fedora:32@qemu-prep extends: .fedora:34@qemu-prep
fedora:32@qemu-forced-rebuild: fedora:34@qemu-forced-rebuild:
extends: .fedora:32@qemu-forced-rebuild extends: .fedora:34@qemu-forced-rebuild
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
@ -277,9 +277,9 @@ fedora:33@container-forced-rebuild:
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
fedora:32@container-prep: fedora:34@container-prep:
extends: extends:
- .fedora:32 - .fedora:34
- .fedora.packages - .fedora.packages
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@ -287,9 +287,9 @@ fedora:32@container-prep:
GIT_STRATEGY: none GIT_STRATEGY: none
# Always rebuilds the container # Always rebuilds the container
fedora:32@container-forced-rebuild: fedora:34@container-forced-rebuild:
extends: extends:
- fedora:32@container-prep - fedora:34@container-prep
only: only:
- schedules - schedules
variables: variables:
@ -297,9 +297,9 @@ fedora:32@container-forced-rebuild:
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
ubuntu:20.04@container-prep: ubuntu:21.04@container-prep:
extends: extends:
- .ubuntu:20.04 - .ubuntu:21.04
- .ubuntu.packages - .ubuntu.packages
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@ -307,9 +307,9 @@ ubuntu:20.04@container-prep:
GIT_STRATEGY: none GIT_STRATEGY: none
# Always rebuilds the container # Always rebuilds the container
ubuntu:20.04@container-forced-rebuild: ubuntu:21.04@container-forced-rebuild:
extends: extends:
- ubuntu:20.04@container-prep - ubuntu:21.04@container-prep
only: only:
- schedules - schedules
variables: variables:
@ -494,19 +494,19 @@ fedora:33@container-clean:
- .container-clean - .container-clean
needs: ["fedora:33@container-prep"] needs: ["fedora:33@container-prep"]
### fedora 32 ### fedora 34
fedora:32@container-clean: fedora:34@container-clean:
extends: extends:
- .fedora:32 - .fedora:34
- .container-clean - .container-clean
needs: ["fedora:32@container-prep"] needs: ["fedora:34@container-prep"]
### ubuntu 20.04 ### ubuntu 21.04
ubuntu:20.04@container-clean: ubuntu:21.04@container-clean:
extends: extends:
- .ubuntu:20.04 - .ubuntu:21.04
- .container-clean - .container-clean
needs: ["ubuntu:20.04@container-prep"] needs: ["ubuntu:21.04@container-prep"]
### ubuntu 20.10 ### ubuntu 20.10
ubuntu:20.10@container-clean: ubuntu:20.10@container-clean:
@ -596,34 +596,34 @@ fedora:33@meson-build:
needs: ['fedora:33@container-prep'] needs: ['fedora:33@container-prep']
fedora:32@autotools-build: fedora:34@autotools-build:
extends: extends:
- .fedora:32 - .fedora:34
- .autotools-build@template - .autotools-build@template
stage: autotools stage: autotools
needs: ['fedora:32@container-prep'] needs: ['fedora:34@container-prep']
fedora:32@meson-build: fedora:34@meson-build:
extends: extends:
- .fedora:32 - .fedora:34
- .meson-build@template - .meson-build@template
stage: meson stage: meson
needs: ['fedora:32@container-prep'] needs: ['fedora:34@container-prep']
ubuntu:20.04@autotools-build: ubuntu:21.04@autotools-build:
extends: extends:
- .ubuntu:20.04 - .ubuntu:21.04
- .autotools-build@template - .autotools-build@template
stage: autotools stage: autotools
needs: ['ubuntu:20.04@container-prep'] needs: ['ubuntu:21.04@container-prep']
ubuntu:20.04@meson-build: ubuntu:21.04@meson-build:
extends: extends:
- .ubuntu:20.04 - .ubuntu:21.04
- .meson-build@template - .meson-build@template
stage: meson stage: meson
needs: ['ubuntu:20.04@container-prep'] needs: ['ubuntu:21.04@container-prep']
ubuntu:20.10@autotools-build: ubuntu:20.10@autotools-build:
@ -853,9 +853,9 @@ soname:
exit 1 ; exit 1 ;
fi fi
.qemu@fedora:32: .qemu@fedora:34:
extends: extends:
- .fedora:32 - .fedora:34
stage: VM stage: VM
image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
tags: tags:
@ -900,19 +900,19 @@ soname:
retry: retry:
max: 2 max: 2
when: script_failure when: script_failure
needs: ['fedora:32@qemu-prep'] needs: ['fedora:34@qemu-prep']
qemu:meson: qemu:meson:
extends: .qemu@fedora:32 extends: .qemu@fedora:34
qemu:meson:valgrind: qemu:meson:valgrind:
extends: .qemu@fedora:32 extends: .qemu@fedora:34
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
meson-from-tarball: meson-from-tarball:
extends: extends:
- .fedora:32 - .fedora:34
stage: tarballs stage: tarballs
script: script:
- export INSTALLDIR="$PWD/_inst" - export INSTALLDIR="$PWD/_inst"
@ -930,11 +930,11 @@ meson-from-tarball:
- ninja -C "$MESON_BUILDDIR" install - ninja -C "$MESON_BUILDDIR" install
- popd > /dev/null - popd > /dev/null
- ls -lR $INSTALLDIR - ls -lR $INSTALLDIR
needs: ['fedora:32@container-prep'] needs: ['fedora:34@container-prep']
autotools-from-tarball: autotools-from-tarball:
extends: extends:
- .fedora:32 - .fedora:34
stage: tarballs stage: tarballs
script: script:
- export INSTALLDIR="$PWD/_inst" - export INSTALLDIR="$PWD/_inst"
@ -952,4 +952,4 @@ autotools-from-tarball:
- popd > /dev/null - popd > /dev/null
- popd > /dev/null - popd > /dev/null
- ls -lR $INSTALLDIR - ls -lR $INSTALLDIR
needs: ['fedora:32@container-prep'] needs: ['fedora:34@container-prep']

6
.gitlab-ci/config.yml
View file

@ -3,7 +3,7 @@
# #
# We're happy to rebuild all containers when one changes. # We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2021-01-04.1' .default_tag: &default_tag '2021-05-19.1'
distributions: distributions:
- name: fedora - name: fedora
@ -12,7 +12,7 @@ distributions:
use_for_tarball_tests: true use_for_tarball_tests: true
versions: versions:
- '33' - '33'
- '32' - '34'
packages: packages:
- git - git
- gcc - gcc
@ -33,7 +33,7 @@ distributions:
- name: ubuntu - name: ubuntu
tag: *default_tag tag: *default_tag
versions: versions:
- '20.04' - '21.04'
- '20.10' - '20.10'
packages: packages:
- git - git