CI: update to use Fedora 38

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2023-04-20 08:59:22 +10:00
parent 861f01928a
commit a9f4fdde0e
2 changed files with 63 additions and 63 deletions

View file

@ -220,17 +220,6 @@ check-whitespace:
# #
#################################################################
fedora:36@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '36'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:37@container-prep:
extends:
- .fdo.container-build@fedora
@ -242,6 +231,17 @@ fedora:37@container-prep:
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:38@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-prep:
extends:
- .fdo.container-build@debian
@ -331,16 +331,6 @@ freebsd:13.1@container-prep:
only:
- schedules
fedora:36@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: '36'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:37@container-clean:
extends:
- .policy
@ -351,6 +341,16 @@ fedora:37@container-clean:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:38@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: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
debian:stable@container-clean:
extends:
- .policy
@ -516,20 +516,20 @@ freebsd:13.1@container-clean:
- export LITEST_JOBS="2"
.fedora:37@test-suite-vm:
.fedora:38@test-suite-vm:
extends:
- .fdo.distribution-image@fedora
- .test-suite-vm
variables:
FDO_DISTRIBUTION_VERSION: 37
FDO_DISTRIBUTION_VERSION: 38
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:37@container-prep"
- "fedora:38@container-prep"
vm-touchpad:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'touchpad'
@ -542,7 +542,7 @@ vm-touchpad-no-libwacom:
vm-tap:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'touchpad-tap'
@ -555,7 +555,7 @@ vm-tap-no-libwacom:
vm-touchpad-buttons:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'touchpad-buttons'
@ -568,7 +568,7 @@ vm-touchpad-buttons-no-libwacom:
vm-tablet:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'tablet'
@ -581,7 +581,7 @@ vm-tablet-no-libwacom:
vm-gestures-device:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'gestures device'
@ -594,7 +594,7 @@ vm-gestures-device-no-libwacom:
vm-backends:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'path udev'
@ -607,7 +607,7 @@ vm-backends-no-libwacom:
vm-misc:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'log misc quirks'
@ -620,7 +620,7 @@ vm-misc-no-libwacom:
vm-other devices:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
@ -633,7 +633,7 @@ vm-other devices-no-libwacom:
vm-pointer:
extends:
- .fedora:37@test-suite-vm
- .fedora:38@test-suite-vm
variables:
SUITE_NAMES: 'pointer'
@ -723,12 +723,12 @@ vm-valgrind-pointer:
- .fdo.distribution-image@fedora
- .build@template
variables:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:37@container-prep"
- "fedora:38@container-prep"
default-build-release@fedora:37:
default-build-release@fedora:38:
stage: distro
extends:
- .fedora-build@template
@ -736,7 +736,7 @@ default-build-release@fedora:37:
MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror"
scan-build@fedora:37:
scan-build@fedora:38:
extends:
- .fedora-build@template
variables:
@ -753,13 +753,13 @@ scan-build@fedora:37:
# run them on one image, they shouldn't fail on one distro
# when they succeed on another.
build-no-libwacom@fedora:37:
build-no-libwacom@fedora:38:
extends:
- .fedora-build@template
variables:
MESON_ARGS: "-Dlibwacom=false"
build-no-libwacom-nodeps@fedora:37:
build-no-libwacom-nodeps@fedora:38:
extends:
- .fedora-build@template
variables:
@ -767,13 +767,13 @@ build-no-libwacom-nodeps@fedora:37:
before_script:
- dnf remove -y libwacom libwacom-devel
build-docs@fedora:37:
build-docs@fedora:38:
extends:
- .fedora-build@template
variables:
MESON_ARGS: "-Ddocumentation=true"
build-no-docs-nodeps@fedora:37:
build-no-docs-nodeps@fedora:38:
extends:
- .fedora-build@template
variables:
@ -781,13 +781,13 @@ build-no-docs-nodeps@fedora:37:
before_script:
- dnf remove -y doxygen graphviz
build-no-debuggui@fedora:37:
build-no-debuggui@fedora:38:
extends:
- .fedora-build@template
variables:
MESON_ARGS: "-Ddebug-gui=false"
build-no-debuggui-nodeps@fedora:37:
build-no-debuggui-nodeps@fedora:38:
extends:
- .fedora-build@template
variables:
@ -795,13 +795,13 @@ build-no-debuggui-nodeps@fedora:37:
before_script:
- dnf remove -y gtk3-devel gtk4-devel
build-no-tests@fedora:37:
build-no-tests@fedora:38:
extends:
- .fedora-build@template
variables:
MESON_ARGS: "-Dtests=false"
build-no-tests-nodeps@fedora:37:
build-no-tests-nodeps@fedora:38:
extends:
- .fedora-build@template
variables:
@ -809,7 +809,7 @@ build-no-tests-nodeps@fedora:37:
before_script:
- dnf remove -y check-devel
valgrind@fedora:37:
valgrind@fedora:38:
extends:
- .fedora-build@template
variables:
@ -817,7 +817,7 @@ valgrind@fedora:37:
# Python checks, only run on Fedora
usr-bin-env-python@fedora:37:
usr-bin-env-python@fedora:38:
extends:
- .fedora-build@template
script:
@ -827,7 +827,7 @@ usr-bin-env-python@fedora:37:
/bin/false
fi
python-format@fedora:37:
python-format@fedora:38:
extends:
- .fedora-build@template
script:
@ -925,18 +925,6 @@ coverity:
# #
#################################################################
fedora:36@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '36'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:36@container-prep"
fedora:37@default-build:
stage: distro
extends:
@ -949,6 +937,18 @@ fedora:37@default-build:
- "fedora:37@container-prep"
fedora:38@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:38@container-prep"
debian:stable@default-build:
stage: distro
extends:
@ -1042,10 +1042,10 @@ build rpm:
- .policy
stage: deploy
variables:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:37@container-prep"
- "fedora:38@container-prep"
script:
- meson "$MESON_BUILDDIR"
- VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version)

View file

@ -9,8 +9,8 @@ distributions:
- name: fedora
tag: *default_tag
versions:
- '36'
- '37'
- '38'
use_for_custom_build_tests: true
use_for_qemu_tests: true
packages: