fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-01-07 17:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: bump the Fedora version to 34

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-08-16 15:00:46 +10:00
parent 50387078d6
commit a240e181c0
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.gitlab-ci.yml
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: '2020-09-25.0'
FEDORA_TAG: '2021-08-16.0'
FDO_UPSTREAM_REPO: libinput/libei
@ -132,14 +132,14 @@ check-merge-request:
# Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
#
#
fedora:32@container-prep:
fedora:34@container-prep:
extends:
- .fdo.container-build@fedora
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@ -178,14 +178,14 @@ fedora:32@container-prep:
only:
- schedules
fedora:32@container-clean:
fedora:34@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
FEDORA_VERSION: '32'
FEDORA_VERSION: '34'
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@ -213,26 +213,26 @@ fedora:32@container-clean:
- .fdo.distribution-image@fedora
- .build@template
variables:
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:32@container-prep"
- "fedora:34@container-prep"
default-build-release@fedora:32:
default-build-release@fedora:34:
stage: distro
extends:
- .fedora-build@template
variables:
MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror"
CFLAGS: "-Werror -Wno-error=vla-parameter" # munit triggers -Wvla-parameter
build-no-libxkcommon-nodeps@fedora:32:
build-no-libxkcommon-nodeps@fedora:34:
extends:
- .fedora-build@template
before_script:
- dnf remove -y libxkcommon-devel
build-no-doxygen@fedora:32:
build-no-doxygen@fedora:34:
extends:
- .fedora-build@template
variables:
@ -240,7 +240,7 @@ build-no-doxygen@fedora:32:
before_script:
- dnf remove -y doxygen
build-no-portal@fedora:32:
build-no-portal@fedora:34:
extends:
- .fedora-build@template
before_script:
@ -248,7 +248,7 @@ build-no-portal@fedora:32:
variables:
MESON_ARGS: "-Dportal=false"
valgrind@fedora:32:
valgrind@fedora:34:
extends:
- .fedora-build@template
variables:
@ -263,16 +263,16 @@ valgrind@fedora:32:
# #
#################################################################
fedora:32@default-build:
fedora:34@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:32@container-prep"
- "fedora:34@container-prep"
pages:

2
.gitlab-ci/ci.template
View file

@ -245,7 +245,7 @@ default-build-release@{{distro.name}}:{{version}}:
- .{{distro.name}}-build@template
variables:
MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror"
CFLAGS: "-Werror -Wno-error=vla-parameter" # munit triggers -Wvla-parameter
build-no-libxkcommon-nodeps@{{distro.name}}:{{version}}:
extends:

4
.gitlab-ci/config.yml
View file

@ -3,11 +3,11 @@
#
# We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2020-09-25.0'
.default_tag: &default_tag '2021-08-16.0'
distributions:
- name: fedora
tag: *default_tag
versions:
- '32'
- '34'
use_for_custom_build_tests: true