diff options
| author | Simon McVittie <smcv@collabora.com> | 2021-09-14 15:19:06 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2021-09-14 15:31:38 +0100 |
| commit | f76549f324cd47590646aabff362ac8c07c93065 (patch) | |
| tree | fe39013cd0d28070026dcf6793e84ebe3fa7422c | |
| parent | 7bf42eed2d241a0cf3879f6080e31a2e2867a2f5 (diff) | |
| download | dbus-python-f76549f324cd47590646aabff362ac8c07c93065.tar.gz | |
CI: Disable documentation build with Python 3.10
The version of sphinx in Ubuntu impish is not currently fully compatible
with Python 3.10.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9753202..d3a3214 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,7 @@ before_script: - ./tools/ci-install.sh variables: + dbus_ci_configure_flags: '' ci_in_docker: "yes" ci_parallel: "2" ci_sudo: "yes" @@ -41,7 +42,7 @@ build:python2.7: dbus_ci_system_python: python script: &script - chown -R user . - - runuser -u user env PATH="/usr/lib/ccache:$PATH" ./tools/ci-build.sh + - runuser -u user -- env PATH="/usr/lib/ccache:$PATH" ./tools/ci-build.sh $dbus_ci_configure_flags build:python2.7-dbg: stage: build @@ -102,6 +103,8 @@ build:python3.10: ci_distro: ubuntu ci_suite: impish dbus_ci_system_python: python3.10 + dbus_ci_configure_flags: --disable-documentation + DISTCHECK_CONFIGURE_FLAGS: --disable-documentation script: *script # vim:set sw=2 sts=2 et: diff --git a/tools/ci-build.sh b/tools/ci-build.sh index ac82998..e8569c3 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -45,7 +45,8 @@ if [ -n "$ci_docker" ]; then --env=dbus_ci_system_python="${dbus_ci_system_python-}" \ --privileged \ ci-image \ - tools/ci-build.sh + tools/ci-build.sh \ + "$@" fi if [ -n "$dbus_ci_system_python" ]; then @@ -77,6 +78,7 @@ e=0 cd "$builddir" && "${srcdir}/configure" \ --enable-installed-tests \ --prefix="$prefix" \ + "$@" \ ${NULL} ) || e=1 if [ "x$e" != x0 ]; then |