diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-11-21 09:44:35 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-11-21 13:21:48 +0000 |
| commit | c4776f8c10b4f371b6dc730369760cb8d8bc980d (patch) | |
| tree | 97d2434a089d8dd0d0fd744f34745644caff706d | |
| parent | 4d2e3fd18c6d8d6b49b8f4de1940499758286d96 (diff) | |
| download | dbus-python-c4776f8c10b4f371b6dc730369760cb8d8bc980d.tar.gz | |
Run CI for Python 3.8
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 42 |
3 files changed, 50 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccc6094..03c1039 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,4 +77,22 @@ build:python3.7-dbg: dbus_ci_system_python: python3-dbg script: *script +build:python3.8: + stage: build + image: "debian:sid-slim" + variables: + ci_suite: sid + dbus_ci_system_python: python3.8 + script: *script + +build:python3.8-dbg: + stage: build + image: "debian:sid-slim" + variables: + ci_suite: sid + dbus_ci_system_python: python3.8-dbg + dbus_ci_system_python_module_prefix: python3- + dbus_ci_system_python_module_suffix: -dbg + script: *script + # vim:set sw=2 sts=2 et: diff --git a/.travis.yml b/.travis.yml index 0192a6d..62e671a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ python: - "3.6" - "3.6-dev" - "3.7-dev" + - "3.8-dev" - "nightly" script: - PATH="/usr/lib/ccache:$PATH" ./tools/ci-build.sh diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 3e40076..319b896 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -75,6 +75,30 @@ if [ -n "$ci_docker" ]; then exec docker build -t ci-image . fi +if [ -n "${dbus_ci_system_python-}" ]; then + if [ -z "${dbus_ci_system_python_module_prefix-}" ]; then + case "$dbus_ci_system_python}" in + (python3*) + dbus_ci_system_python_module_prefix=python3- + ;; + (*) + dbus_ci_system_python_module_prefix=python- + ;; + esac + fi + + if [ -z "${dbus_ci_system_python_module_suffix-}" ]; then + case "$dbus_ci_system_python}" in + (*-dbg) + dbus_ci_system_python_module_suffix=-dbg + ;; + (*) + dbus_ci_system_python_module_suffix= + ;; + esac + fi +fi + case "$ci_distro" in (debian|ubuntu) # Don't ask questions, just do it @@ -114,16 +138,12 @@ case "$ci_distro" in sudo apt-get -qq -y install \ ${dbus_ci_system_python} \ ${dbus_ci_system_python%-dbg}-dev \ - ${dbus_ci_system_python%-dbg}-docutils \ - ${dbus_ci_system_python%-dbg}-gi \ - ${dbus_ci_system_python%-dbg}-pip \ - ${dbus_ci_system_python%-dbg}-setuptools \ + ${dbus_ci_system_python_module_prefix}docutils \ + ${dbus_ci_system_python_module_prefix}gi${dbus_ci_system_python_module_suffix} \ + ${dbus_ci_system_python_module_prefix}pip \ + ${dbus_ci_system_python_module_prefix}setuptools \ ${NULL} - if [ "${dbus_ci_system_python%-dbg}" != "${dbus_ci_system_python}" ]; then - sudo apt-get -qq -y install ${dbus_ci_system_python%-dbg}-gi-dbg - fi - if [ "$dbus_ci_system_python" = python ]; then sudo apt-get -qq -y install python-gobject-2 fi @@ -133,7 +153,7 @@ case "$ci_distro" in ;; (*) - $sudo apt-get -qq -y install ${dbus_ci_system_python%-dbg}-tap + $sudo apt-get -qq -y install ${dbus_ci_system_python_module_prefix}tap have_system_tappy=yes ;; esac @@ -144,8 +164,8 @@ case "$ci_distro" in (*) $sudo apt-get -qq -y install \ - ${dbus_ci_system_python%-dbg}-sphinx \ - ${dbus_ci_system_python%-dbg}-sphinx-rtd-theme \ + ${dbus_ci_system_python_module_prefix}sphinx \ + ${dbus_ci_system_python_module_prefix}sphinx-rtd-theme \ ${NULL} have_system_sphinx=yes ;; |