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

CI: install meson and ninja from pip

Browse source 
Let's keep testing against the most recent stable meson/ninja releases.
This commit is contained in:
Peter Hutterer 2023-05-18 11:28:39 +10:00
parent df268d618a
commit ade03d5245
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -38,8 +38,8 @@ variables:
# See the documentation here: #
# https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html #
###############################################################################
FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config meson systemd-devel libxkbcommon-devel libxml2 doxygen python3-attrs python3-pytest python3-dbusmock python3-jinja2 python3-pip hugo '
DEBIAN_PACKAGES: 'git gcc g++ pkg-config meson libsystemd-dev libxkbcommon-dev libxml2 doxygen python3-attr python3-pytest python3-dbusmock python3-jinja2 python3-pip '
FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config systemd-devel libxkbcommon-devel libxml2 doxygen python3-attrs python3-pytest python3-dbusmock python3-jinja2 python3-pip hugo '
DEBIAN_PACKAGES: 'git gcc g++ pkg-config libsystemd-dev libxkbcommon-dev libxml2 doxygen python3-attr python3-pytest python3-dbusmock python3-jinja2 python3-pip '
############################ end of package lists #############################
# these tags should be updated each time the list of packages is updated
@ -174,7 +174,7 @@ fedora:37@container-prep:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: 'pip install structlog strenum'
FDO_DISTRIBUTION_EXEC: 'pip install meson ninja structlog strenum'
debian:bullseye@container-prep:
extends:
@ -186,7 +186,7 @@ debian:bullseye@container-prep:
FDO_DISTRIBUTION_VERSION: 'bullseye'
FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: 'pip install structlog strenum'
FDO_DISTRIBUTION_EXEC: 'pip install meson ninja structlog strenum'

2
.gitlab-ci/ci.template
View file

@ -183,7 +183,7 @@ python-ruff:
FDO_DISTRIBUTION_VERSION: '{{version}}'
FDO_DISTRIBUTION_PACKAGES: ${{distro.name.upper()}}_PACKAGES
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
FDO_DISTRIBUTION_EXEC: 'pip install structlog strenum'
FDO_DISTRIBUTION_EXEC: 'pip install meson ninja structlog strenum'
{% endfor %}
{% endfor %}

2
.gitlab-ci/config.yml
View file

@ -17,7 +17,6 @@ distributions:
- gcc
- gcc-c++
- pkgconf-pkg-config
- meson
- systemd-devel
- libxkbcommon-devel
- libxml2
@ -37,7 +36,6 @@ distributions:
- gcc
- g++
- pkg-config
- meson
- libsystemd-dev
- libxkbcommon-dev
- libxml2