mirror of
https://gitlab.freedesktop.org/libevdev/libevdev.git
synced 2025-12-20 17:20:05 +01:00
CI: bump to new fedoras and ubuntus
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
parent
d399abca1a
commit
d21d826b63
2 changed files with 86 additions and 86 deletions
166
.gitlab-ci.yml
166
.gitlab-ci.yml
|
|
@ -74,52 +74,52 @@ variables:
|
|||
variables:
|
||||
MESON_TEST_ARGS: '--no-suite=needs-uinput'
|
||||
|
||||
.fedora:36:
|
||||
extends: .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_VERSION: '36'
|
||||
|
||||
.fedora:37:
|
||||
extends: .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: '37'
|
||||
|
||||
.ubuntu:22.04:
|
||||
.fedora:38:
|
||||
extends: .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: '38'
|
||||
|
||||
.ubuntu:23.04:
|
||||
extends: .fdo.distribution-image@ubuntu
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_VERSION: '22.04'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: '23.04'
|
||||
|
||||
.ubuntu:22.10:
|
||||
extends: .fdo.distribution-image@ubuntu
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: '22.10'
|
||||
|
||||
.debian:stable:
|
||||
extends: .fdo.distribution-image@debian
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'stable'
|
||||
|
||||
.debian:sid:
|
||||
extends: .fdo.distribution-image@debian
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'sid'
|
||||
|
||||
.arch:rolling:
|
||||
extends: .fdo.distribution-image@arch
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'rolling'
|
||||
|
||||
.alpine:latest:
|
||||
extends: .fdo.distribution-image@alpine
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
|
||||
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
|
||||
FDO_DISTRIBUTION_VERSION: 'latest'
|
||||
|
||||
|
||||
|
|
@ -207,26 +207,6 @@ check-merge-request:
|
|||
|
||||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
fedora:36@container-prep:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .fedora.packages
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
|
||||
# Always rebuilds the container
|
||||
fedora:36@container-forced-rebuild:
|
||||
extends:
|
||||
- fedora:36@container-prep
|
||||
only:
|
||||
- schedules
|
||||
variables:
|
||||
FDO_FORCE_REBUILD: 1
|
||||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
fedora:37@container-prep:
|
||||
extends:
|
||||
|
|
@ -248,9 +228,29 @@ fedora:37@container-forced-rebuild:
|
|||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
ubuntu:22.04@container-prep:
|
||||
fedora:38@container-prep:
|
||||
extends:
|
||||
- .ubuntu:22.04
|
||||
- .fedora:38
|
||||
- .fedora.packages
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
|
||||
# Always rebuilds the container
|
||||
fedora:38@container-forced-rebuild:
|
||||
extends:
|
||||
- fedora:38@container-prep
|
||||
only:
|
||||
- schedules
|
||||
variables:
|
||||
FDO_FORCE_REBUILD: 1
|
||||
|
||||
|
||||
# Pulls in the container from upstream or rebuilds it if missing
|
||||
ubuntu:23.04@container-prep:
|
||||
extends:
|
||||
- .ubuntu:23.04
|
||||
- .ubuntu.packages
|
||||
- .fdo.container-build@ubuntu
|
||||
stage: prep
|
||||
|
|
@ -258,9 +258,9 @@ ubuntu:22.04@container-prep:
|
|||
GIT_STRATEGY: none
|
||||
|
||||
# Always rebuilds the container
|
||||
ubuntu:22.04@container-forced-rebuild:
|
||||
ubuntu:23.04@container-forced-rebuild:
|
||||
extends:
|
||||
- ubuntu:22.04@container-prep
|
||||
- ubuntu:23.04@container-prep
|
||||
only:
|
||||
- schedules
|
||||
variables:
|
||||
|
|
@ -398,13 +398,6 @@ alpine:latest@container-forced-rebuild:
|
|||
only:
|
||||
- schedules
|
||||
|
||||
### fedora 36
|
||||
fedora:36@container-clean:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .container-clean
|
||||
needs: ["fedora:36@container-prep"]
|
||||
|
||||
### fedora 37
|
||||
fedora:37@container-clean:
|
||||
extends:
|
||||
|
|
@ -412,12 +405,19 @@ fedora:37@container-clean:
|
|||
- .container-clean
|
||||
needs: ["fedora:37@container-prep"]
|
||||
|
||||
### ubuntu 22.04
|
||||
ubuntu:22.04@container-clean:
|
||||
### fedora 38
|
||||
fedora:38@container-clean:
|
||||
extends:
|
||||
- .ubuntu:22.04
|
||||
- .fedora:38
|
||||
- .container-clean
|
||||
needs: ["ubuntu:22.04@container-prep"]
|
||||
needs: ["fedora:38@container-prep"]
|
||||
|
||||
### ubuntu 23.04
|
||||
ubuntu:23.04@container-clean:
|
||||
extends:
|
||||
- .ubuntu:23.04
|
||||
- .container-clean
|
||||
needs: ["ubuntu:23.04@container-prep"]
|
||||
|
||||
### ubuntu 22.10
|
||||
ubuntu:22.10@container-clean:
|
||||
|
|
@ -476,21 +476,6 @@ alpine:latest@container-clean:
|
|||
dependencies: []
|
||||
|
||||
|
||||
fedora:36@autotools-build:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['fedora:36@container-prep']
|
||||
|
||||
fedora:36@meson-build:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['fedora:36@container-prep']
|
||||
|
||||
|
||||
fedora:37@autotools-build:
|
||||
extends:
|
||||
- .fedora:37
|
||||
|
|
@ -506,19 +491,34 @@ fedora:37@meson-build:
|
|||
needs: ['fedora:37@container-prep']
|
||||
|
||||
|
||||
ubuntu:22.04@autotools-build:
|
||||
fedora:38@autotools-build:
|
||||
extends:
|
||||
- .ubuntu:22.04
|
||||
- .fedora:38
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['ubuntu:22.04@container-prep']
|
||||
needs: ['fedora:38@container-prep']
|
||||
|
||||
ubuntu:22.04@meson-build:
|
||||
fedora:38@meson-build:
|
||||
extends:
|
||||
- .ubuntu:22.04
|
||||
- .fedora:38
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['ubuntu:22.04@container-prep']
|
||||
needs: ['fedora:38@container-prep']
|
||||
|
||||
|
||||
ubuntu:23.04@autotools-build:
|
||||
extends:
|
||||
- .ubuntu:23.04
|
||||
- .autotools-build@template
|
||||
stage: autotools
|
||||
needs: ['ubuntu:23.04@container-prep']
|
||||
|
||||
ubuntu:23.04@meson-build:
|
||||
extends:
|
||||
- .ubuntu:23.04
|
||||
- .meson-build@template
|
||||
stage: meson
|
||||
needs: ['ubuntu:23.04@container-prep']
|
||||
|
||||
|
||||
ubuntu:22.10@autotools-build:
|
||||
|
|
@ -602,10 +602,10 @@ alpine:latest@meson-build:
|
|||
# because they're supposed to fail equally on all
|
||||
.fedora-custom-build@autotools-template:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .fedora:37
|
||||
- .autotools-build@template
|
||||
stage: build
|
||||
needs: ['fedora:36@container-prep']
|
||||
needs: ['fedora:37@container-prep']
|
||||
|
||||
no-valgrind:autotools:
|
||||
extends: .fedora-custom-build@autotools-template
|
||||
|
|
@ -644,10 +644,10 @@ enable-gcov:autotools:
|
|||
|
||||
.fedora-custom-build@meson-template:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .fedora:37
|
||||
- .meson-build@template
|
||||
stage: build
|
||||
needs: ['fedora:36@container-prep']
|
||||
needs: ['fedora:37@container-prep']
|
||||
|
||||
no-valgrind:meson:
|
||||
extends: .fedora-custom-build@meson-template
|
||||
|
|
@ -698,7 +698,7 @@ static-build:meson:
|
|||
|
||||
soname:
|
||||
extends:
|
||||
- .fedora:36
|
||||
- .fedora:37
|
||||
stage: build
|
||||
script:
|
||||
- ./autogen.sh --prefix=$PWD/prefix-autotools/
|
||||
|
|
@ -707,7 +707,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:36@container-prep']
|
||||
needs: ['fedora:37@container-prep']
|
||||
|
||||
#################################################################
|
||||
# #
|
||||
|
|
@ -751,10 +751,10 @@ qemu:meson:
|
|||
stage: VM
|
||||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
- .fedora:37
|
||||
- .fedora:38
|
||||
- .build-in-b2c@template
|
||||
needs:
|
||||
- "fedora:37@container-prep"
|
||||
- "fedora:38@container-prep"
|
||||
|
||||
qemu:meson:valgrind:
|
||||
extends:
|
||||
|
|
@ -765,7 +765,7 @@ qemu:meson:valgrind:
|
|||
|
||||
meson-from-tarball:
|
||||
extends:
|
||||
- .fedora:37
|
||||
- .fedora:38
|
||||
stage: tarballs
|
||||
script:
|
||||
- export INSTALLDIR="$PWD/_inst"
|
||||
|
|
@ -783,11 +783,11 @@ meson-from-tarball:
|
|||
- ninja -C "$MESON_BUILDDIR" install
|
||||
- popd > /dev/null
|
||||
- ls -lR $INSTALLDIR
|
||||
needs: ['fedora:37@container-prep']
|
||||
needs: ['fedora:38@container-prep']
|
||||
|
||||
autotools-from-tarball:
|
||||
extends:
|
||||
- .fedora:37
|
||||
- .fedora:38
|
||||
stage: tarballs
|
||||
script:
|
||||
- export INSTALLDIR="$PWD/_inst"
|
||||
|
|
@ -808,4 +808,4 @@ autotools-from-tarball:
|
|||
variables:
|
||||
LIBEVDEV_SKIP_ROOT_TESTS: 1
|
||||
|
||||
needs: ['fedora:37@container-prep']
|
||||
needs: ['fedora:38@container-prep']
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2023-02-15.0'
|
||||
.default_tag: &default_tag '2023-05-08.0'
|
||||
|
||||
distributions:
|
||||
- name: fedora
|
||||
|
|
@ -12,8 +12,8 @@ distributions:
|
|||
# only one distro for qemu tests
|
||||
use_for_qemu_tests: true
|
||||
versions:
|
||||
- '36'
|
||||
- '37'
|
||||
- '38'
|
||||
packages:
|
||||
- git
|
||||
- gcc
|
||||
|
|
@ -42,7 +42,7 @@ distributions:
|
|||
- name: ubuntu
|
||||
tag: *default_tag
|
||||
versions:
|
||||
- '22.04'
|
||||
- '23.04'
|
||||
- '22.10'
|
||||
packages:
|
||||
- git
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue