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

gitlab CI: bump from Fedora 32 to 34

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 5a6f141bd8)
This commit is contained in:
Peter Hutterer 2021-05-12 07:39:05 +10:00
parent 54451cb7a0
commit 9b4f50472f
3 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
.gitlab-ci.yml
View file

@ -92,13 +92,13 @@ variables:
# changing these will force rebuilding the associated image # changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular # Note: these tags have no meaning and are not tied to a particular
# libinput version # libinput version
FEDORA_TAG: '2021-01-04.1' FEDORA_TAG: '2021-05-12.0'
DEBIAN_TAG: '2021-01-04.1' DEBIAN_TAG: '2021-05-12.0'
UBUNTU_TAG: '2021-01-04.1' UBUNTU_TAG: '2021-05-12.0'
ARCH_TAG: '2021-01-04.1' ARCH_TAG: '2021-05-12.0'
ALPINE_TAG: '2021-01-04.1' ALPINE_TAG: '2021-05-12.0'
FREEBSD_TAG: '2021-01-04.1' FREEBSD_TAG: '2021-05-12.0'
QEMU_TAG: 'qemu-vm-2021-01-04.1' QEMU_TAG: 'qemu-vm-2021-05-12.0'
FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG
FDO_UPSTREAM_REPO: libinput/libinput FDO_UPSTREAM_REPO: libinput/libinput
@ -179,7 +179,7 @@ check-commit:
# Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set # Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
# #
# #
fedora:33@qemu-prep: fedora:34@qemu-prep:
extends: extends:
- .fdo.qemu-build@fedora - .fdo.qemu-build@fedora
- .policy - .policy
@ -188,21 +188,10 @@ fedora:33@qemu-prep:
- kvm - kvm
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: $QEMU_TAG FDO_DISTRIBUTION_TAG: $QEMU_TAG
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
fedora:32@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:33@container-prep: fedora:33@container-prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
@ -214,6 +203,17 @@ fedora:33@container-prep:
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:34@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-prep: debian:stable@container-prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
@ -353,15 +353,6 @@ freebsd:11.2@container-prep:
only: only:
- schedules - schedules
fedora:32@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:33@container-clean: fedora:33@container-clean:
extends: extends:
- .container-clean - .container-clean
@ -371,6 +362,15 @@ fedora:33@container-clean:
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '33'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:34@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-clean: debian:stable@container-clean:
extends: extends:
- .container-clean - .container-clean
@ -510,19 +510,19 @@ freebsd:11.2@container-clean:
when: script_failure when: script_failure
.fedora:33@test-suite-vm: .fedora:34@test-suite-vm:
extends: extends:
- .test-suite-vm - .test-suite-vm
variables: variables:
FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: $QEMU_TAG FDO_DISTRIBUTION_TAG: $QEMU_TAG
needs: needs:
- "fedora:33@qemu-prep" - "fedora:34@qemu-prep"
vm-touchpad: vm-touchpad:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad' SUITE_NAMES: 'touchpad'
@ -535,7 +535,7 @@ vm-touchpad-no-libwacom:
vm-tap: vm-tap:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad-tap' SUITE_NAMES: 'touchpad-tap'
@ -548,7 +548,7 @@ vm-tap-no-libwacom:
vm-touchpad-buttons: vm-touchpad-buttons:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad-buttons' SUITE_NAMES: 'touchpad-buttons'
@ -561,7 +561,7 @@ vm-touchpad-buttons-no-libwacom:
vm-tablet: vm-tablet:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet' SUITE_NAMES: 'tablet'
@ -574,7 +574,7 @@ vm-tablet-no-libwacom:
vm-gestures-device: vm-gestures-device:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'gestures device' SUITE_NAMES: 'gestures device'
@ -587,7 +587,7 @@ vm-gestures-device-no-libwacom:
vm-backends: vm-backends:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'path udev' SUITE_NAMES: 'path udev'
@ -600,7 +600,7 @@ vm-backends-no-libwacom:
vm-misc: vm-misc:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'log misc quirks' SUITE_NAMES: 'log misc quirks'
@ -613,7 +613,7 @@ vm-misc-no-libwacom:
vm-other devices: vm-other devices:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch' SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
@ -626,7 +626,7 @@ vm-other devices-no-libwacom:
vm-pointer: vm-pointer:
extends: extends:
- .fedora:33@test-suite-vm - .fedora:34@test-suite-vm
variables: variables:
SUITE_NAMES: 'pointer' SUITE_NAMES: 'pointer'
@ -707,12 +707,12 @@ vm-valgrind-pointer:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .build@template - .build@template
variables: variables:
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:33@container-prep" - "fedora:34@container-prep"
default-build-release@fedora:33: default-build-release@fedora:34:
stage: distro stage: distro
extends: extends:
- .fedora-build@template - .fedora-build@template
@ -720,7 +720,7 @@ default-build-release@fedora:33:
MESON_ARGS: "-Dbuildtype=release" MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror" CFLAGS: "-Werror"
scan-build@fedora:33: scan-build@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -739,13 +739,13 @@ scan-build@fedora:33:
# run them on one image, they shouldn't fail on one distro # run them on one image, they shouldn't fail on one distro
# when they succeed on another. # when they succeed on another.
build-no-libwacom@fedora:33: build-no-libwacom@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
build-no-libwacom-nodeps@fedora:33: build-no-libwacom-nodeps@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -753,13 +753,13 @@ build-no-libwacom-nodeps@fedora:33:
before_script: before_script:
- dnf remove -y libwacom libwacom-devel - dnf remove -y libwacom libwacom-devel
build-no-docs@fedora:33: build-no-docs@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Ddocumentation=false" MESON_ARGS: "-Ddocumentation=false"
build-no-docs-nodeps@fedora:33: build-no-docs-nodeps@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -767,13 +767,13 @@ build-no-docs-nodeps@fedora:33:
before_script: before_script:
- dnf remove -y doxygen graphviz - dnf remove -y doxygen graphviz
build-no-debuggui@fedora:33: build-no-debuggui@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
build-no-debuggui-nodeps@fedora:33: build-no-debuggui-nodeps@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -781,13 +781,13 @@ build-no-debuggui-nodeps@fedora:33:
before_script: before_script:
- dnf remove -y gtk3-devel - dnf remove -y gtk3-devel
build-no-tests@fedora:33: build-no-tests@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
build-no-tests-nodeps@fedora:33: build-no-tests-nodeps@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -795,7 +795,7 @@ build-no-tests-nodeps@fedora:33:
before_script: before_script:
- dnf remove -y check-devel - dnf remove -y check-devel
valgrind@fedora:33: valgrind@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -805,7 +805,7 @@ valgrind@fedora:33:
# Python checks, only run on Fedora # Python checks, only run on Fedora
usr-bin-env-python@fedora:33: usr-bin-env-python@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
script: script:
@ -815,7 +815,7 @@ usr-bin-env-python@fedora:33:
/bin/false /bin/false
fi fi
python-format@fedora:33: python-format@fedora:34:
extends: extends:
- .fedora-build@template - .fedora-build@template
before_script: before_script:
@ -917,18 +917,6 @@ coverity:
# # # #
################################################################# #################################################################
fedora:32@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:32@container-prep"
fedora:33@default-build: fedora:33@default-build:
stage: distro stage: distro
extends: extends:
@ -941,6 +929,18 @@ fedora:33@default-build:
- "fedora:33@container-prep" - "fedora:33@container-prep"
fedora:34@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:34@container-prep"
debian:stable@default-build: debian:stable@default-build:
stage: distro stage: distro
extends: extends:
@ -1051,10 +1051,10 @@ build rpm:
- .policy - .policy
stage: deploy stage: deploy
variables: variables:
FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:32@container-prep" - "fedora:33@container-prep"
script: script:
- dnf install -y rpmdevtools jq - dnf install -y rpmdevtools jq
- meson "$MESON_BUILDDIR" - meson "$MESON_BUILDDIR"

4
.gitlab-ci/ci.template
View file

@ -704,10 +704,10 @@ build rpm:
- .policy - .policy
stage: deploy stage: deploy
variables: variables:
FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:32@container-prep" - "fedora:33@container-prep"
script: script:
- dnf install -y rpmdevtools jq - dnf install -y rpmdevtools jq
- meson "$MESON_BUILDDIR" - meson "$MESON_BUILDDIR"

4
.gitlab-ci/config.yml
View file

@ -3,14 +3,14 @@
# #
# 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-12.0'
distributions: distributions:
- name: fedora - name: fedora
tag: *default_tag tag: *default_tag
versions: versions:
- '32'
- '33' - '33'
- '34' # last is picked for qemu
want_qemu: true want_qemu: true
use_for_custom_build_tests: true use_for_custom_build_tests: true
packages: packages: