Skip to content
Snippets Groups Projects
Commit d21d826b authored by Peter Hutterer's avatar Peter Hutterer
Browse files

CI: bump to new fedoras and ubuntus 


Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
parent d399abca
No related branches found
No related tags found
No related merge requests found
Pipeline #875601 passed with warnings
Stage: prep
Stage: build
Stage: VM
Stage: autotools
Stage: meson
Stage: tarballs
Stage: merge-check
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 67
− 67
View file @ d21d826b
......@@ -74,52 +74,52 @@ variables:
variables:
MESON_TEST_ARGS: '--no-suite=needs-uinput'
.fedora:36:
.fedora:37:
extends: .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
FDO_DISTRIBUTION_VERSION: '36'
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
FDO_DISTRIBUTION_VERSION: '37'
.fedora:37:
.fedora:38:
extends: .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_TAG: '2023-02-15.0'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: '2023-05-08.0'
FDO_DISTRIBUTION_VERSION: '38'
.ubuntu:22.04:
.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'
......@@ -208,9 +208,9 @@ check-merge-request:
# Pulls in the container from upstream or rebuilds it if missing
fedora:36@container-prep:
fedora:37@container-prep:
extends:
- .fedora:36
- .fedora:37
- .fedora.packages
- .fdo.container-build@fedora
stage: prep
......@@ -218,9 +218,9 @@ fedora:36@container-prep:
GIT_STRATEGY: none
# Always rebuilds the container
fedora:36@container-forced-rebuild:
fedora:37@container-forced-rebuild:
extends:
- fedora:36@container-prep
- fedora:37@container-prep
only:
- schedules
variables:
......@@ -228,9 +228,9 @@ fedora:36@container-forced-rebuild:
# Pulls in the container from upstream or rebuilds it if missing
fedora:37@container-prep:
fedora:38@container-prep:
extends:
- .fedora:37
- .fedora:38
- .fedora.packages
- .fdo.container-build@fedora
stage: prep
......@@ -238,9 +238,9 @@ fedora:37@container-prep:
GIT_STRATEGY: none
# Always rebuilds the container
fedora:37@container-forced-rebuild:
fedora:38@container-forced-rebuild:
extends:
- fedora:37@container-prep
- fedora:38@container-prep
only:
- schedules
variables:
......@@ -248,9 +248,9 @@ fedora:37@container-forced-rebuild:
# Pulls in the container from upstream or rebuilds it if missing
ubuntu:22.04@container-prep:
ubuntu:23.04@container-prep:
extends:
- .ubuntu:22.04
- .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:
- .fedora:38
- .container-clean
needs: ["fedora:38@container-prep"]
### ubuntu 23.04
ubuntu:23.04@container-clean:
extends:
- .ubuntu:22.04
- .ubuntu:23.04
- .container-clean
needs: ["ubuntu:22.04@container-prep"]
needs: ["ubuntu:23.04@container-prep"]
### ubuntu 22.10
ubuntu:22.10@container-clean:
......@@ -476,49 +476,49 @@ alpine:latest@container-clean:
dependencies: []
fedora:36@autotools-build:
fedora:37@autotools-build:
extends:
- .fedora:36
- .fedora:37
- .autotools-build@template
stage: autotools
needs: ['fedora:36@container-prep']
needs: ['fedora:37@container-prep']
fedora:36@meson-build:
fedora:37@meson-build:
extends:
- .fedora:36
- .fedora:37
- .meson-build@template
stage: meson
needs: ['fedora:36@container-prep']
needs: ['fedora:37@container-prep']
fedora:37@autotools-build:
fedora:38@autotools-build:
extends:
- .fedora:37
- .fedora:38
- .autotools-build@template
stage: autotools
needs: ['fedora:37@container-prep']
needs: ['fedora:38@container-prep']
fedora:37@meson-build:
fedora:38@meson-build:
extends:
- .fedora:37
- .fedora:38
- .meson-build@template
stage: meson
needs: ['fedora:37@container-prep']
needs: ['fedora:38@container-prep']
ubuntu:22.04@autotools-build:
ubuntu:23.04@autotools-build:
extends:
- .ubuntu:22.04
- .ubuntu:23.04
- .autotools-build@template
stage: autotools
needs: ['ubuntu:22.04@container-prep']
needs: ['ubuntu:23.04@container-prep']
ubuntu:22.04@meson-build:
ubuntu:23.04@meson-build:
extends:
- .ubuntu:22.04
- .ubuntu:23.04
- .meson-build@template
stage: meson
needs: ['ubuntu:22.04@container-prep']
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']
.gitlab-ci/config.yml
+ 3
− 3
View file @ d21d826b
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment