diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-02-25 13:36:37 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-02-25 14:17:01 +0000 |
| commit | fc2353f210ed7fe12396fc9448b953b4ab8100d1 (patch) | |
| tree | 2288ed0104e88b70f9caf0d9aaac078d85eb0ed0 | |
| parent | bad56dc99aec10926af1157c63ba345364d2e53c (diff) | |
| download | dbus-fc2353f210ed7fe12396fc9448b953b4ab8100d1.tar.gz | |
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>
| -rwxr-xr-x | tools/ci-build.sh | 3 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 9e6c9974..cfb7fb55 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 ba8ee560..8ebfa7c3 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 |