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 9e6c997483e34f427b0e3abe86d29b274aabdc94..cfb7fb55be11f01089bd45c5530e189ab64197e4 100755 (executable)
--- 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 ba8ee560a22198acf068f947de6a49f6b3b8552e..8ebfa7c32cec3b6100f4e2fb9627897e3ae7d343 100755 (executable)
--- 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