CI: bump to Fedora 37

Fedora 35 is EOL
This commit is contained in:
Peter Hutterer 2022-12-05 14:47:46 +10:00
parent 7713ad5ac5
commit d741b3b7ce
2 changed files with 21 additions and 21 deletions

View file

@ -39,7 +39,7 @@ 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: '2022-02-16.0'
FEDORA_TAG: '2022-12-05.0'
FDO_UPSTREAM_REPO: libinput/libei
@ -146,14 +146,14 @@ check-merge-request:
# Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
#
#
fedora:35@container-prep:
fedora:37@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@ -192,14 +192,14 @@ fedora:35@container-prep:
only:
- schedules
fedora:35@container-clean:
fedora:37@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
FEDORA_VERSION: '35'
FEDORA_VERSION: '37'
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@ -227,12 +227,12 @@ fedora:35@container-clean:
- .fdo.distribution-image@fedora
- .build@template
variables:
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:35@container-prep"
- "fedora:37@container-prep"
default-build-release@fedora:35:
default-build-release@fedora:37:
stage: distro
extends:
- .fedora-build@template
@ -240,13 +240,13 @@ default-build-release@fedora:35:
MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror -Wno-error=vla-parameter" # munit triggers -Wvla-parameter
build-no-libxkcommon-nodeps@fedora:35:
build-no-libxkcommon-nodeps@fedora:37:
extends:
- .fedora-build@template
before_script:
- dnf remove -y libxkcommon-devel
build-no-doxygen@fedora:35:
build-no-doxygen@fedora:37:
extends:
- .fedora-build@template
variables:
@ -254,7 +254,7 @@ build-no-doxygen@fedora:35:
before_script:
- dnf remove -y doxygen
build-no-portal@fedora:35:
build-no-portal@fedora:37:
extends:
- .fedora-build@template
before_script:
@ -262,7 +262,7 @@ build-no-portal@fedora:35:
variables:
MESON_ARGS: "-Dportal=false"
valgrind@fedora:35:
valgrind@fedora:37:
extends:
- .fedora-build@template
variables:
@ -270,7 +270,7 @@ valgrind@fedora:35:
before_script:
- dnf install -y valgrind
werror@fedora:35:
werror@fedora:37:
extends:
- .fedora-build@template
variables:
@ -284,16 +284,16 @@ werror@fedora:35:
# #
#################################################################
fedora:35@default-build:
fedora:37@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:35@container-prep"
- "fedora:37@container-prep"
pages:
@ -302,7 +302,7 @@ pages:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
MESON_ARGS: "-Ddocumentation=true"
after_script:

View file

@ -3,15 +3,15 @@
#
# We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2022-02-16.0'
.default_tag: &default_tag '2022-12-05.0'
distributions:
- name: fedora
tag: *default_tag
versions:
- '35' # update the pages job when bumping the version
- '37' # update the pages job when bumping the version
use_for_custom_build_tests: true
pages:
distro: fedora
version: 35
version: 37