mirror of
https://gitlab.freedesktop.org/libevdev/libevdev.git
synced 2026-04-03 12:40:38 +02:00
CI: bump to Fedora 43 and Ubuntu 25.10
And bump the templates to a newer version too (whatever libinput currently uses). Part-of: <https://gitlab.freedesktop.org/libevdev/libevdev/-/merge_requests/133>
This commit is contained in:
Peter Hutterer
parent
6ce9eb3162
commit
c0e27c94c5
3 changed files with 51 additions and 91 deletions
133
.gitlab-ci.yml
133
.gitlab-ci.yml
|
|
@ -4,7 +4,7 @@
|
|||
# #
|
||||
########################################
|
||||
|
||||
.templates_sha: &template_sha e195d80f35b45cc73668be3767b923fd76c70ed5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha c6aeb16f86e32525fa630fb99c66c4f3e62fc3cb
|
||||
|
||||
include:
|
||||
- project: 'freedesktop/ci-templates'
|
||||
|
|
@ -72,46 +72,40 @@ variables:
|
|||
variables:
|
||||
MESON_TEST_ARGS: '--no-suite=needs-uinput'
|
||||
|
||||
.fedora:40:
|
||||
.fedora:43:
|
||||
extends: .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_VERSION: '40'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
|
||||
.fedora:41:
|
||||
extends: .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_VERSION: '41'
|
||||
|
||||
.ubuntu:24.10:
|
||||
.ubuntu:25.10:
|
||||
extends: .fdo.distribution-image@ubuntu
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_VERSION: '24.10'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: '25.10'
|
||||
|
||||
.debian:stable:
|
||||
extends: .fdo.distribution-image@debian
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'stable'
|
||||
|
||||
.debian:sid:
|
||||
extends: .fdo.distribution-image@debian
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'sid'
|
||||
|
||||
.arch:rolling:
|
||||
extends: .fdo.distribution-image@arch
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'rolling'
|
||||
|
||||
.alpine:latest:
|
||||
extends: .fdo.distribution-image@alpine
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2024-11-25.0'
|
||||
FDO_DISTRIBUTION_TAG: '2026-01-16.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'latest'
|
||||
|
||||
|
||||
|
|
@ -197,9 +191,9 @@ check-merge-request:
|
|||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
fedora:40@container-prep:
|
||||
fedora:43@container-prep:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .fedora.packages
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
|
|
@ -208,20 +202,9 @@ fedora:40@container-prep:
|
|||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
fedora:41@container-prep:
|
||||
ubuntu:25.10@container-prep:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .fedora.packages
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
ubuntu:24.10@container-prep:
|
||||
extends:
|
||||
- .ubuntu:24.10
|
||||
- .ubuntu:25.10
|
||||
- .ubuntu.packages
|
||||
- .fdo.container-build@ubuntu
|
||||
stage: prep
|
||||
|
|
@ -302,26 +285,19 @@ alpine:latest@container-prep:
|
|||
only:
|
||||
- schedules
|
||||
|
||||
### fedora 40
|
||||
fedora:40@container-clean:
|
||||
### fedora 43
|
||||
fedora:43@container-clean:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .container-clean
|
||||
needs: ["fedora:40@container-prep"]
|
||||
needs: ["fedora:43@container-prep"]
|
||||
|
||||
### fedora 41
|
||||
fedora:41@container-clean:
|
||||
### ubuntu 25.10
|
||||
ubuntu:25.10@container-clean:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .ubuntu:25.10
|
||||
- .container-clean
|
||||
needs: ["fedora:41@container-prep"]
|
||||
|
||||
### ubuntu 24.10
|
||||
ubuntu:24.10@container-clean:
|
||||
extends:
|
||||
- .ubuntu:24.10
|
||||
- .container-clean
|
||||
needs: ["ubuntu:24.10@container-prep"]
|
||||
needs: ["ubuntu:25.10@container-prep"]
|
||||
|
||||
### debian stable
|
||||
debian:stable@container-clean:
|
||||
|
|
@ -373,49 +349,34 @@ alpine:latest@container-clean:
|
|||
dependencies: []
|
||||
|
||||
|
||||
fedora:40@autotools-build:
|
||||
fedora:43@autotools-build:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['fedora:40@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
fedora:40@meson-build:
|
||||
fedora:43@meson-build:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['fedora:40@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
|
||||
fedora:41@autotools-build:
|
||||
ubuntu:25.10@autotools-build:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .ubuntu:25.10
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['fedora:41@container-prep']
|
||||
needs: ['ubuntu:25.10@container-prep']
|
||||
|
||||
fedora:41@meson-build:
|
||||
ubuntu:25.10@meson-build:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .ubuntu:25.10
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['fedora:41@container-prep']
|
||||
|
||||
|
||||
ubuntu:24.10@autotools-build:
|
||||
extends:
|
||||
- .ubuntu:24.10
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['ubuntu:24.10@container-prep']
|
||||
|
||||
ubuntu:24.10@meson-build:
|
||||
extends:
|
||||
- .ubuntu:24.10
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['ubuntu:24.10@container-prep']
|
||||
needs: ['ubuntu:25.10@container-prep']
|
||||
|
||||
|
||||
debian:stable@autotools-build:
|
||||
|
|
@ -484,10 +445,10 @@ alpine:latest@meson-build:
|
|||
# because they're supposed to fail equally on all
|
||||
.fedora-custom-build@autotools-template:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .autotools-build@template
|
||||
stage: build
|
||||
needs: ['fedora:40@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
no-valgrind:autotools:
|
||||
extends: .fedora-custom-build@autotools-template
|
||||
|
|
@ -526,10 +487,10 @@ enable-gcov:autotools:
|
|||
|
||||
.fedora-custom-build@meson-template:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
- .meson-build@template
|
||||
stage: build
|
||||
needs: ['fedora:40@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
no-valgrind:meson:
|
||||
extends: .fedora-custom-build@meson-template
|
||||
|
|
@ -580,7 +541,7 @@ static-build:meson:
|
|||
|
||||
soname:
|
||||
extends:
|
||||
- .fedora:40
|
||||
- .fedora:43
|
||||
stage: build
|
||||
script:
|
||||
- ./autogen.sh --prefix=$PWD/prefix-autotools/
|
||||
|
|
@ -589,7 +550,7 @@ soname:
|
|||
- meson "$MESON_BUILDDIR" --prefix=$PWD/prefix-meson/
|
||||
- ninja -C "$MESON_BUILDDIR" install
|
||||
- ls -l $PWD/prefix-meson/lib64/libevdev.so.2.3.0
|
||||
needs: ['fedora:40@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
#################################################################
|
||||
# #
|
||||
|
|
@ -632,10 +593,10 @@ qemu:meson:
|
|||
stage: VM
|
||||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
- .fedora:41
|
||||
- .fedora:43
|
||||
- .build-in-b2c@template
|
||||
needs:
|
||||
- "fedora:41@container-prep"
|
||||
- "fedora:43@container-prep"
|
||||
|
||||
qemu:meson:valgrind:
|
||||
extends:
|
||||
|
|
@ -646,7 +607,7 @@ qemu:meson:valgrind:
|
|||
|
||||
meson-from-tarball:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .fedora:43
|
||||
stage: tarballs
|
||||
script:
|
||||
- export INSTALLDIR="$PWD/_inst"
|
||||
|
|
@ -664,11 +625,11 @@ meson-from-tarball:
|
|||
- ninja -C "$MESON_BUILDDIR" install
|
||||
- popd > /dev/null
|
||||
- ls -lR $INSTALLDIR
|
||||
needs: ['fedora:41@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
||||
autotools-from-tarball:
|
||||
extends:
|
||||
- .fedora:41
|
||||
- .fedora:43
|
||||
stage: tarballs
|
||||
script:
|
||||
- export INSTALLDIR="$PWD/_inst"
|
||||
|
|
@ -689,4 +650,4 @@ autotools-from-tarball:
|
|||
variables:
|
||||
LIBEVDEV_SKIP_ROOT_TESTS: 1
|
||||
|
||||
needs: ['fedora:41@container-prep']
|
||||
needs: ['fedora:43@container-prep']
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# #
|
||||
########################################
|
||||
|
||||
.templates_sha: &template_sha e195d80f35b45cc73668be3767b923fd76c70ed5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha c6aeb16f86e32525fa630fb99c66c4f3e62fc3cb
|
||||
|
||||
include:
|
||||
- project: 'freedesktop/ci-templates'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2024-11-25.0'
|
||||
.default_tag: &default_tag '2026-01-16.0'
|
||||
|
||||
distributions:
|
||||
- name: fedora
|
||||
|
|
@ -12,8 +12,7 @@ distributions:
|
|||
# only one distro for qemu tests
|
||||
use_for_qemu_tests: true
|
||||
versions:
|
||||
- '40'
|
||||
- '41'
|
||||
- '43'
|
||||
packages:
|
||||
- git
|
||||
- gcc
|
||||
|
|
@ -42,7 +41,7 @@ distributions:
|
|||
- name: ubuntu
|
||||
tag: *default_tag
|
||||
versions:
|
||||
- '24.10'
|
||||
- '25.10'
|
||||
packages:
|
||||
- git
|
||||
- gcc
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue