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

ci: bump to Fedora 39 and FreeBSD to 13.2

Browse source 
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/985>
This commit is contained in:
Peter Hutterer 2024-03-18 12:00:48 +10:00
parent 301895685e
commit 3a935507ae
2 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
.gitlab-ci.yml
View file

@ -93,12 +93,12 @@ 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: '2023-02-13.0' FEDORA_TAG: '2024-03-18.0'
DEBIAN_TAG: '2023-02-13.0' DEBIAN_TAG: '2024-03-18.0'
UBUNTU_TAG: '2023-02-13.0' UBUNTU_TAG: '2024-03-18.0'
ARCH_TAG: '2023-02-13.0' ARCH_TAG: '2024-03-18.0'
ALPINE_TAG: '2023-02-13.0' ALPINE_TAG: '2024-03-18.0'
FREEBSD_TAG: '2023-02-13.0' FREEBSD_TAG: '2024-03-18.0'
FDO_UPSTREAM_REPO: libinput/libinput FDO_UPSTREAM_REPO: libinput/libinput
@ -220,17 +220,6 @@ check-whitespace:
# # # #
################################################################# #################################################################
fedora:37@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:38@container-prep: fedora:38@container-prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
@ -242,6 +231,17 @@ fedora:38@container-prep:
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:39@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '39'
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
@ -286,7 +286,7 @@ alpine:latest@container-prep:
FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES
FDO_DISTRIBUTION_TAG: $ALPINE_TAG FDO_DISTRIBUTION_TAG: $ALPINE_TAG
freebsd:13.1@container-prep: freebsd:13.2@container-prep:
extends: extends:
- .fdo.qemu-build@freebsd - .fdo.qemu-build@freebsd
- .policy - .policy
@ -295,7 +295,7 @@ freebsd:13.1@container-prep:
stage: prep stage: prep
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_VERSION: '13.2'
FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
@ -331,16 +331,6 @@ freebsd:13.1@container-prep:
only: only:
- schedules - schedules
fedora:37@container-clean:
extends:
- .policy
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:38@container-clean: fedora:38@container-clean:
extends: extends:
- .policy - .policy
@ -351,6 +341,16 @@ fedora:38@container-clean:
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:39@container-clean:
extends:
- .policy
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-clean: debian:stable@container-clean:
extends: extends:
- .policy - .policy
@ -391,14 +391,14 @@ alpine:latest@container-clean:
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
FDO_DISTRIBUTION_TAG: $ALPINE_TAG FDO_DISTRIBUTION_TAG: $ALPINE_TAG
freebsd:13.1@container-clean: freebsd:13.2@container-clean:
extends: extends:
- .policy - .policy
- .container-clean - .container-clean
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_VERSION: '13.2'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
@ -515,20 +515,20 @@ freebsd:13.1@container-clean:
- export LITEST_JOBS="2" - export LITEST_JOBS="2"
.fedora:38@test-suite-vm: .fedora:39@test-suite-vm:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .test-suite-vm - .test-suite-vm
variables: variables:
FDO_DISTRIBUTION_VERSION: 38 FDO_DISTRIBUTION_VERSION: 39
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:38@container-prep" - "fedora:39@container-prep"
vm-touchpad: vm-touchpad:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad' SUITE_NAMES: 'touchpad'
@ -541,7 +541,7 @@ vm-touchpad-no-libwacom:
vm-tap: vm-tap:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad-tap' SUITE_NAMES: 'touchpad-tap'
@ -554,7 +554,7 @@ vm-tap-no-libwacom:
vm-touchpad-buttons: vm-touchpad-buttons:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad-buttons' SUITE_NAMES: 'touchpad-buttons'
@ -567,7 +567,7 @@ vm-touchpad-buttons-no-libwacom:
vm-tablet: vm-tablet:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet' SUITE_NAMES: 'tablet'
@ -580,7 +580,7 @@ vm-tablet-no-libwacom:
vm-gestures-device: vm-gestures-device:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'gestures device' SUITE_NAMES: 'gestures device'
@ -593,7 +593,7 @@ vm-gestures-device-no-libwacom:
vm-backends: vm-backends:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'path udev' SUITE_NAMES: 'path udev'
@ -606,7 +606,7 @@ vm-backends-no-libwacom:
vm-misc: vm-misc:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'log misc quirks' SUITE_NAMES: 'log misc quirks'
@ -619,7 +619,7 @@ vm-misc-no-libwacom:
vm-other devices: vm-other devices:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch' SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
@ -632,7 +632,7 @@ vm-other devices-no-libwacom:
vm-pointer: vm-pointer:
extends: extends:
- .fedora:38@test-suite-vm - .fedora:39@test-suite-vm
variables: variables:
SUITE_NAMES: 'pointer' SUITE_NAMES: 'pointer'
@ -722,12 +722,12 @@ vm-valgrind-pointer:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .build@template - .build@template
variables: variables:
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:38@container-prep" - "fedora:39@container-prep"
default-build-release@fedora:38: default-build-release@fedora:39:
stage: distro stage: distro
extends: extends:
- .fedora-build@template - .fedora-build@template
@ -735,7 +735,7 @@ default-build-release@fedora:38:
MESON_ARGS: "-Dbuildtype=release" MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror" CFLAGS: "-Werror"
scan-build@fedora:38: scan-build@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -752,13 +752,13 @@ scan-build@fedora:38:
# 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:38: build-no-libwacom@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
build-no-libwacom-nodeps@fedora:38: build-no-libwacom-nodeps@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -766,13 +766,13 @@ build-no-libwacom-nodeps@fedora:38:
before_script: before_script:
- dnf remove -y libwacom libwacom-devel - dnf remove -y libwacom libwacom-devel
build-docs@fedora:38: build-docs@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Ddocumentation=true" MESON_ARGS: "-Ddocumentation=true"
build-no-docs-nodeps@fedora:38: build-no-docs-nodeps@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -780,13 +780,13 @@ build-no-docs-nodeps@fedora:38:
before_script: before_script:
- dnf remove -y doxygen graphviz - dnf remove -y doxygen graphviz
build-no-debuggui@fedora:38: build-no-debuggui@fedora:39:
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:38: build-no-debuggui-nodeps@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -794,13 +794,13 @@ build-no-debuggui-nodeps@fedora:38:
before_script: before_script:
- dnf remove -y gtk3-devel gtk4-devel - dnf remove -y gtk3-devel gtk4-devel
build-no-tests@fedora:38: build-no-tests@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
build-no-tests-nodeps@fedora:38: build-no-tests-nodeps@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -808,7 +808,7 @@ build-no-tests-nodeps@fedora:38:
before_script: before_script:
- dnf remove -y check-devel - dnf remove -y check-devel
valgrind@fedora:38: valgrind@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
@ -816,7 +816,7 @@ valgrind@fedora:38:
# Python checks, only run on Fedora # Python checks, only run on Fedora
usr-bin-env-python@fedora:38: usr-bin-env-python@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
script: script:
@ -826,7 +826,7 @@ usr-bin-env-python@fedora:38:
/bin/false /bin/false
fi fi
python-format@fedora:38: python-format@fedora:39:
extends: extends:
- .fedora-build@template - .fedora-build@template
script: script:
@ -924,18 +924,6 @@ coverity:
# # # #
################################################################# #################################################################
fedora:37@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:37@container-prep"
fedora:38@default-build: fedora:38@default-build:
stage: distro stage: distro
extends: extends:
@ -948,6 +936,18 @@ fedora:38@default-build:
- "fedora:38@container-prep" - "fedora:38@container-prep"
fedora:39@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:39@container-prep"
debian:stable@default-build: debian:stable@default-build:
stage: distro stage: distro
extends: extends:
@ -998,18 +998,18 @@ alpine:latest@default-build:
- "alpine:latest@container-prep" - "alpine:latest@container-prep"
freebsd:13.1@default-build: freebsd:13.2@default-build:
stage: distro stage: distro
extends: extends:
- .build-in-qemu@template - .build-in-qemu@template
- .fdo.distribution-image@freebsd - .fdo.distribution-image@freebsd
variables: variables:
FDO_DISTRIBUTION_VERSION: '13.1' FDO_DISTRIBUTION_VERSION: '13.2'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps
MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet
needs: needs:
- "freebsd:13.1@container-prep" - "freebsd:13.2@container-prep"
################################################################# #################################################################
@ -1044,10 +1044,10 @@ build rpm:
- .policy - .policy
stage: deploy stage: deploy
variables: variables:
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:38@container-prep" - "fedora:39@container-prep"
script: script:
- meson "$MESON_BUILDDIR" - meson "$MESON_BUILDDIR"
- VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version) - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)

6
.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 '2023-02-13.0' .default_tag: &default_tag '2024-03-18.0'
distributions: distributions:
- name: fedora - name: fedora
tag: *default_tag tag: *default_tag
versions: versions:
- '37'
- '38' - '38'
- '39'
use_for_custom_build_tests: true use_for_custom_build_tests: true
use_for_qemu_tests: true use_for_qemu_tests: true
packages: packages:
@ -148,7 +148,7 @@ distributions:
tag: *default_tag tag: *default_tag
qemu_based: true qemu_based: true
versions: versions:
- '13.1' - '13.2'
packages: packages:
- git - git
- pkgconf - pkgconf