ci: Use common-dependencies script to install argcomplete
It is a dependency of the new gdctl tool, and therefore no longer confined to tests. Install it via the common-dependencies script, so that the dependency is also satisfied for gnome-os and systemd system extensions. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4233>
This commit is contained in:
parent
4f218537cd
commit
6bd76eec0c
@ -106,7 +106,7 @@ variables:
|
|||||||
- .skip-git-clone
|
- .skip-git-clone
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: 41
|
FDO_DISTRIBUTION_VERSION: 41
|
||||||
BASE_TAG: '2025-01-29.0'
|
BASE_TAG: '2025-01-30.0'
|
||||||
MUTTER_USER: 'meta-user'
|
MUTTER_USER: 'meta-user'
|
||||||
FDO_DISTRIBUTION_PACKAGES:
|
FDO_DISTRIBUTION_PACKAGES:
|
||||||
clang
|
clang
|
||||||
@ -125,7 +125,6 @@ variables:
|
|||||||
zenity
|
zenity
|
||||||
python3-dbusmock
|
python3-dbusmock
|
||||||
gnome-desktop-testing
|
gnome-desktop-testing
|
||||||
python3-argcomplete
|
|
||||||
ruff
|
ruff
|
||||||
|
|
||||||
FDO_DISTRIBUTION_EXEC: |
|
FDO_DISTRIBUTION_EXEC: |
|
||||||
|
@ -35,6 +35,21 @@ pkgconf() {
|
|||||||
env "${ENV[@]}" pkgconf --env-only "$@"
|
env "${ENV[@]}" pkgconf --env-only "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pip_install() {
|
||||||
|
local pkg=$1
|
||||||
|
|
||||||
|
for destdir in "${DESTDIRS[@]}"; do
|
||||||
|
local pypaths=($destdir/usr/lib*/python3*/site-packages)
|
||||||
|
if ! pip3 list "${pypaths[@]/#/--path=}" | grep $pkg >/dev/null
|
||||||
|
then
|
||||||
|
pip3 install --ignore-installed \
|
||||||
|
--root-user-action ignore \
|
||||||
|
--prefix $destdir/usr \
|
||||||
|
$pkg
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
TEMP=$(getopt \
|
TEMP=$(getopt \
|
||||||
--name=$(basename $0) \
|
--name=$(basename $0) \
|
||||||
--options='h' \
|
--options='h' \
|
||||||
@ -85,3 +100,5 @@ then
|
|||||||
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
|
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
|
||||||
master
|
master
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
pip_install argcomplete
|
||||||
|
Loading…
x
Reference in New Issue
Block a user