From: Simon McVittie <smcv@collabora.com>
Date: Fri, 25 Feb 2022 13:36:37 +0000 (+0000)
Subject: CI: Use Python 3
X-Git-Tag: dbus-1.12.22~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2353f210ed7fe12396fc9448b953b4ab8100d1;p=thirdparty%2Fdbus.git

CI: Use Python 3

The dbus-1.12 branch needed Python, which the master branch no longer
does, but we can at least use a modern Python.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 9e6c99748..cfb7fb55b 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -111,7 +111,7 @@ case "$ci_buildsys" in
         # to assert that our official release tarballs will be enough
         # to build with CMake.
         mkdir -p ci-build-dist
-        ( cd ci-build-dist; ../configure )
+        ( cd ci-build-dist; ../configure PYTHON=python3 )
         make -C ci-build-dist dist
         tar -zxvf ci-build-dist/dbus-1.*.tar.gz
         cd dbus-1.*/
@@ -256,6 +256,7 @@ case "$ci_buildsys" in
             --enable-installed-tests \
             --enable-maintainer-mode \
             --enable-modular-tests \
+            PYTHON=python3 \
             "$@"
 
         ${make}
diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index ba8ee560a..8ebfa7c32 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -177,9 +177,9 @@ case "$ci_distro" in
             libselinux1-dev
             libsystemd-dev
             libx11-dev
-            python
-            python-dbus
-            python-gi
+            python3
+            python3-dbus
+            python3-gi
             sudo
             valgrind
             wget