mirror of
https://gitlab.freedesktop.org/libinput/libei.git
synced 2026-01-27 00:50:23 +01:00
gitlab CI: update to build on F35 and latest ci-templates
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
parent
47d8b2e0b5
commit
d3149b75c2
3 changed files with 22 additions and 22 deletions
|
|
@ -6,7 +6,7 @@
|
|||
# #
|
||||
########################################
|
||||
|
||||
.templates_sha: &template_sha a7ea345b7a0b19e8a86a20d5349f9eca797cc1c7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
|
||||
include:
|
||||
# Fedora container builder template
|
||||
|
|
@ -23,7 +23,7 @@ stages:
|
|||
|
||||
variables:
|
||||
###############################################################################
|
||||
# This is the list of packages required to build libinput with the default #
|
||||
# This is the list of packages required to build libei with the default #
|
||||
# configuration. #
|
||||
# #
|
||||
# Run dnf install/apt-get install/.. with the list of packages for your #
|
||||
|
|
@ -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: '2021-08-16.0'
|
||||
FEDORA_TAG: '2022-02-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:34@container-prep:
|
||||
fedora:35@container-prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
- .policy
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
|
|
@ -178,14 +178,14 @@ fedora:34@container-prep:
|
|||
only:
|
||||
- schedules
|
||||
|
||||
fedora:34@container-clean:
|
||||
fedora:35@container-clean:
|
||||
extends:
|
||||
- .container-clean
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FEDORA_VERSION: '34'
|
||||
FEDORA_VERSION: '35'
|
||||
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
|
||||
|
|
@ -213,12 +213,12 @@ fedora:34@container-clean:
|
|||
- .fdo.distribution-image@fedora
|
||||
- .build@template
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:34@container-prep"
|
||||
- "fedora:35@container-prep"
|
||||
|
||||
default-build-release@fedora:34:
|
||||
default-build-release@fedora:35:
|
||||
stage: distro
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
|
|
@ -226,13 +226,13 @@ default-build-release@fedora:34:
|
|||
MESON_ARGS: "-Dbuildtype=release"
|
||||
CFLAGS: "-Werror -Wno-error=vla-parameter" # munit triggers -Wvla-parameter
|
||||
|
||||
build-no-libxkcommon-nodeps@fedora:34:
|
||||
build-no-libxkcommon-nodeps@fedora:35:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
before_script:
|
||||
- dnf remove -y libxkcommon-devel
|
||||
|
||||
build-no-doxygen@fedora:34:
|
||||
build-no-doxygen@fedora:35:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -240,7 +240,7 @@ build-no-doxygen@fedora:34:
|
|||
before_script:
|
||||
- dnf remove -y doxygen
|
||||
|
||||
build-no-portal@fedora:34:
|
||||
build-no-portal@fedora:35:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
before_script:
|
||||
|
|
@ -248,7 +248,7 @@ build-no-portal@fedora:34:
|
|||
variables:
|
||||
MESON_ARGS: "-Dportal=false"
|
||||
|
||||
valgrind@fedora:34:
|
||||
valgrind@fedora:35:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -263,16 +263,16 @@ valgrind@fedora:34:
|
|||
# #
|
||||
#################################################################
|
||||
|
||||
fedora:34@default-build:
|
||||
fedora:35@default-build:
|
||||
stage: distro
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:34@container-prep"
|
||||
- "fedora:35@container-prep"
|
||||
|
||||
|
||||
pages:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
# #
|
||||
########################################
|
||||
|
||||
.templates_sha: &template_sha a7ea345b7a0b19e8a86a20d5349f9eca797cc1c7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
.templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
|
||||
include:
|
||||
{% for distro in distributions|sort(attribute="name") %}
|
||||
|
|
@ -29,7 +29,7 @@ stages:
|
|||
|
||||
variables:
|
||||
###############################################################################
|
||||
# This is the list of packages required to build libinput with the default #
|
||||
# This is the list of packages required to build libei with the default #
|
||||
# configuration. #
|
||||
# #
|
||||
# Run dnf install/apt-get install/.. with the list of packages for your #
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2021-08-16.0'
|
||||
.default_tag: &default_tag '2022-02-16.0'
|
||||
|
||||
distributions:
|
||||
- name: fedora
|
||||
tag: *default_tag
|
||||
versions:
|
||||
- '34' # update the pages job when bumping the version
|
||||
- '35' # update the pages job when bumping the version
|
||||
use_for_custom_build_tests: true
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue