CI: bump to use F38

This commit is contained in:
Peter Hutterer 2023-05-18 16:57:16 +10:00
parent cc046f1f67
commit 73662468cf
2 changed files with 19 additions and 19 deletions

View file

@ -48,8 +48,8 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# libinput version
FEDORA_TAG: '2023-05-18.1'
DEBIAN_TAG: '2023-05-18.1'
FEDORA_TAG: '2023-05-18.2'
DEBIAN_TAG: '2023-05-18.2'
FDO_UPSTREAM_REPO: libinput/libei
@ -166,14 +166,14 @@ python-ruff:
# Build distribution-specific images used by the jobs in the build stage
#
fedora:37@container-prep:
fedora:38@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: 'pip install $FEDORA_PIP_PACKAGES'
@ -224,12 +224,12 @@ debian:bullseye@container-prep:
- .build@template
variables:
MESON_TEST_ARGS: '--no-suite=python'
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
@ -237,13 +237,13 @@ default-build-release@fedora:37:
MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror -Wno-error=vla-parameter" # munit triggers -Wvla-parameter
build-no-libxkcommon-nodeps@fedora:37:
build-no-libxkcommon-nodeps@fedora:38:
extends:
- .fedora-build@template
before_script:
- dnf remove -y libxkcommon-devel
build-no-doxygen@fedora:37:
build-no-doxygen@fedora:38:
extends:
- .fedora-build@template
variables:
@ -251,7 +251,7 @@ build-no-doxygen@fedora:37:
before_script:
- dnf remove -y doxygen hugo
valgrind@fedora:37:
valgrind@fedora:38:
extends:
- .fedora-build@template
variables:
@ -259,13 +259,13 @@ valgrind@fedora:37:
before_script:
- dnf install -y valgrind
pytest@fedora:37:
pytest@fedora:38:
extends:
- .fedora-build@template
variables:
MESON_TEST_ARGS: '--suite=python'
werror@fedora:37:
werror@fedora:38:
extends:
- .fedora-build@template
variables:
@ -279,16 +279,16 @@ werror@fedora:37:
# #
#################################################################
fedora:37@default-build:
fedora:38@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:37@container-prep"
- "fedora:38@container-prep"
debian:bullseye@default-build:
stage: distro
@ -308,7 +308,7 @@ pages:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
MESON_ARGS: "-Ddocumentation=protocol,api"
script:

View file

@ -3,13 +3,13 @@
#
# We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2023-05-18.1'
.default_tag: &default_tag '2023-05-18.2'
distributions:
- name: fedora
tag: *default_tag
versions:
- '37' # update the pages job when bumping the version
- '38' # update the pages job when bumping the version
use_for_custom_build_tests: true
packages:
- git
@ -58,4 +58,4 @@ distributions:
pages:
distro: fedora
version: 37
version: 38