From 6bd76eec0c32bd5d56e9ed33ace3ac8b55b1bf7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 30 Jan 2025 14:46:15 +0100
Subject: [PATCH] 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>
---
 .gitlab-ci.yml                            |  3 +--
 .gitlab-ci/install-common-dependencies.sh | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dfe89115..93b2ba1ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -106,7 +106,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 41
-    BASE_TAG: '2025-01-29.0'
+    BASE_TAG: '2025-01-30.0'
     MUTTER_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       clang
@@ -125,7 +125,6 @@ variables:
       zenity
       python3-dbusmock
       gnome-desktop-testing
-      python3-argcomplete
       ruff
 
     FDO_DISTRIBUTION_EXEC: |
diff --git a/.gitlab-ci/install-common-dependencies.sh b/.gitlab-ci/install-common-dependencies.sh
index ee2a90690..25d341215 100755
--- a/.gitlab-ci/install-common-dependencies.sh
+++ b/.gitlab-ci/install-common-dependencies.sh
@@ -35,6 +35,21 @@ pkgconf() {
   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 \
   --name=$(basename $0) \
   --options='h' \
@@ -85,3 +100,5 @@ then
       https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
       master
 fi
+
+pip_install argcomplete