gitlab CI: bump to latest fedoras and ubuntu

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2024-11-25 10:13:29 +10:00
parent 2342d8c9ee
commit 72fa564092
2 changed files with 67 additions and 67 deletions

View file

@ -72,46 +72,46 @@ variables:
variables: variables:
MESON_TEST_ARGS: '--no-suite=needs-uinput' MESON_TEST_ARGS: '--no-suite=needs-uinput'
.fedora:38: .fedora:40:
extends: .fdo.distribution-image@fedora extends: .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_TAG: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '40'
.fedora:39: .fedora:41:
extends: .fdo.distribution-image@fedora extends: .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_TAG: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
FDO_DISTRIBUTION_VERSION: '39' FDO_DISTRIBUTION_VERSION: '41'
.ubuntu:23.04: .ubuntu:24.10:
extends: .fdo.distribution-image@ubuntu extends: .fdo.distribution-image@ubuntu
variables: variables:
FDO_DISTRIBUTION_TAG: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
FDO_DISTRIBUTION_VERSION: '23.04' FDO_DISTRIBUTION_VERSION: '24.10'
.debian:stable: .debian:stable:
extends: .fdo.distribution-image@debian extends: .fdo.distribution-image@debian
variables: variables:
FDO_DISTRIBUTION_TAG: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
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: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_VERSION: 'sid'
.arch:rolling: .arch:rolling:
extends: .fdo.distribution-image@arch extends: .fdo.distribution-image@arch
variables: variables:
FDO_DISTRIBUTION_TAG: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
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: '2024-03-24.0' FDO_DISTRIBUTION_TAG: '2024-11-25.0'
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
@ -188,7 +188,7 @@ check-merge-request:
.arch.packages: .arch.packages:
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'git gcc meson automake autoconf libtool make pkgconfig python3 check valgrind binutils doxygen' FDO_DISTRIBUTION_PACKAGES: 'git gc meson automake autoconf libtool make pkgconfig python3 check valgrind binutils doxygen'
.alpine.packages: .alpine.packages:
variables: variables:
@ -197,9 +197,9 @@ check-merge-request:
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
fedora:38@container-prep: fedora:40@container-prep:
extends: extends:
- .fedora:38 - .fedora:40
- .fedora.packages - .fedora.packages
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@ -208,9 +208,9 @@ fedora:38@container-prep:
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
fedora:39@container-prep: fedora:41@container-prep:
extends: extends:
- .fedora:39 - .fedora:41
- .fedora.packages - .fedora.packages
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@ -219,9 +219,9 @@ fedora:39@container-prep:
# Pulls in the container from upstream or rebuilds it if missing # Pulls in the container from upstream or rebuilds it if missing
ubuntu:23.04@container-prep: ubuntu:24.10@container-prep:
extends: extends:
- .ubuntu:23.04 - .ubuntu:24.10
- .ubuntu.packages - .ubuntu.packages
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@ -302,26 +302,26 @@ alpine:latest@container-prep:
only: only:
- schedules - schedules
### fedora 38 ### fedora 40
fedora:38@container-clean: fedora:40@container-clean:
extends: extends:
- .fedora:38 - .fedora:40
- .container-clean - .container-clean
needs: ["fedora:38@container-prep"] needs: ["fedora:40@container-prep"]
### fedora 39 ### fedora 41
fedora:39@container-clean: fedora:41@container-clean:
extends: extends:
- .fedora:39 - .fedora:41
- .container-clean - .container-clean
needs: ["fedora:39@container-prep"] needs: ["fedora:41@container-prep"]
### ubuntu 23.04 ### ubuntu 24.10
ubuntu:23.04@container-clean: ubuntu:24.10@container-clean:
extends: extends:
- .ubuntu:23.04 - .ubuntu:24.10
- .container-clean - .container-clean
needs: ["ubuntu:23.04@container-prep"] needs: ["ubuntu:24.10@container-prep"]
### debian stable ### debian stable
debian:stable@container-clean: debian:stable@container-clean:
@ -373,49 +373,49 @@ alpine:latest@container-clean:
dependencies: [] dependencies: []
fedora:38@autotools-build: fedora:40@autotools-build:
extends: extends:
- .fedora:38 - .fedora:40
- .autotools-build@template - .autotools-build@template
stage: autotools stage: autotools
needs: ['fedora:38@container-prep'] needs: ['fedora:40@container-prep']
fedora:38@meson-build: fedora:40@meson-build:
extends: extends:
- .fedora:38 - .fedora:40
- .meson-build@template - .meson-build@template
stage: meson stage: meson
needs: ['fedora:38@container-prep'] needs: ['fedora:40@container-prep']
fedora:39@autotools-build: fedora:41@autotools-build:
extends: extends:
- .fedora:39 - .fedora:41
- .autotools-build@template - .autotools-build@template
stage: autotools stage: autotools
needs: ['fedora:39@container-prep'] needs: ['fedora:41@container-prep']
fedora:39@meson-build: fedora:41@meson-build:
extends: extends:
- .fedora:39 - .fedora:41
- .meson-build@template - .meson-build@template
stage: meson stage: meson
needs: ['fedora:39@container-prep'] needs: ['fedora:41@container-prep']
ubuntu:23.04@autotools-build: ubuntu:24.10@autotools-build:
extends: extends:
- .ubuntu:23.04 - .ubuntu:24.10
- .autotools-build@template - .autotools-build@template
stage: autotools stage: autotools
needs: ['ubuntu:23.04@container-prep'] needs: ['ubuntu:24.10@container-prep']
ubuntu:23.04@meson-build: ubuntu:24.10@meson-build:
extends: extends:
- .ubuntu:23.04 - .ubuntu:24.10
- .meson-build@template - .meson-build@template
stage: meson stage: meson
needs: ['ubuntu:23.04@container-prep'] needs: ['ubuntu:24.10@container-prep']
debian:stable@autotools-build: debian:stable@autotools-build:
@ -484,10 +484,10 @@ alpine:latest@meson-build:
# because they're supposed to fail equally on all # because they're supposed to fail equally on all
.fedora-custom-build@autotools-template: .fedora-custom-build@autotools-template:
extends: extends:
- .fedora:38 - .fedora:40
- .autotools-build@template - .autotools-build@template
stage: build stage: build
needs: ['fedora:38@container-prep'] needs: ['fedora:40@container-prep']
no-valgrind:autotools: no-valgrind:autotools:
extends: .fedora-custom-build@autotools-template extends: .fedora-custom-build@autotools-template
@ -526,10 +526,10 @@ enable-gcov:autotools:
.fedora-custom-build@meson-template: .fedora-custom-build@meson-template:
extends: extends:
- .fedora:38 - .fedora:40
- .meson-build@template - .meson-build@template
stage: build stage: build
needs: ['fedora:38@container-prep'] needs: ['fedora:40@container-prep']
no-valgrind:meson: no-valgrind:meson:
extends: .fedora-custom-build@meson-template extends: .fedora-custom-build@meson-template
@ -580,7 +580,7 @@ static-build:meson:
soname: soname:
extends: extends:
- .fedora:38 - .fedora:40
stage: build stage: build
script: script:
- ./autogen.sh --prefix=$PWD/prefix-autotools/ - ./autogen.sh --prefix=$PWD/prefix-autotools/
@ -589,7 +589,7 @@ soname:
- meson "$MESON_BUILDDIR" --prefix=$PWD/prefix-meson/ - meson "$MESON_BUILDDIR" --prefix=$PWD/prefix-meson/
- ninja -C "$MESON_BUILDDIR" install - ninja -C "$MESON_BUILDDIR" install
- ls -l $PWD/prefix-meson/lib64/libevdev.so.2.3.0 - ls -l $PWD/prefix-meson/lib64/libevdev.so.2.3.0
needs: ['fedora:38@container-prep'] needs: ['fedora:40@container-prep']
################################################################# #################################################################
# # # #
@ -632,10 +632,10 @@ qemu:meson:
stage: VM stage: VM
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .fedora:39 - .fedora:41
- .build-in-b2c@template - .build-in-b2c@template
needs: needs:
- "fedora:39@container-prep" - "fedora:41@container-prep"
qemu:meson:valgrind: qemu:meson:valgrind:
extends: extends:
@ -646,7 +646,7 @@ qemu:meson:valgrind:
meson-from-tarball: meson-from-tarball:
extends: extends:
- .fedora:39 - .fedora:41
stage: tarballs stage: tarballs
script: script:
- export INSTALLDIR="$PWD/_inst" - export INSTALLDIR="$PWD/_inst"
@ -664,11 +664,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:39@container-prep'] needs: ['fedora:41@container-prep']
autotools-from-tarball: autotools-from-tarball:
extends: extends:
- .fedora:39 - .fedora:41
stage: tarballs stage: tarballs
script: script:
- export INSTALLDIR="$PWD/_inst" - export INSTALLDIR="$PWD/_inst"
@ -689,4 +689,4 @@ autotools-from-tarball:
variables: variables:
LIBEVDEV_SKIP_ROOT_TESTS: 1 LIBEVDEV_SKIP_ROOT_TESTS: 1
needs: ['fedora:39@container-prep'] needs: ['fedora:41@container-prep']

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 '2024-03-24.0' .default_tag: &default_tag '2024-11-25.0'
distributions: distributions:
- name: fedora - name: fedora
@ -12,8 +12,8 @@ distributions:
# only one distro for qemu tests # only one distro for qemu tests
use_for_qemu_tests: true use_for_qemu_tests: true
versions: versions:
- '38' - '40'
- '39' - '41'
packages: packages:
- git - git
- gcc - gcc
@ -42,7 +42,7 @@ distributions:
- name: ubuntu - name: ubuntu
tag: *default_tag tag: *default_tag
versions: versions:
- '23.04' - '24.10'
packages: packages:
- git - git
- gcc - gcc
@ -86,7 +86,7 @@ distributions:
- 'rolling' - 'rolling'
packages: packages:
- git - git
- gcc - gc
- meson - meson
- automake - automake
- autoconf - autoconf