Merge branch 'ci-updates' into 'master'

CI: Update to Debian 10 'buster', drop Debian 8 'jessie', add qhelpgenerator

See merge request dbus/dbus!151

.gitlab-ci.yml

@@ -20,7 +20,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-image: debian:stretch-slim
+image: debian:buster-slim
 
 stages:
   - build
@@ -44,11 +44,11 @@ variables:
   ci_parallel: "2"
   ci_sudo: "yes"
   ci_distro: "debian"
-  ci_suite: "stretch"
+  ci_suite: "buster"
 
 build:production:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "production"
   script: &script
@@ -57,7 +57,7 @@ build:production:
 
 build:debug:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "debug"
   script: *script
@@ -65,7 +65,7 @@ build:debug:
 build:reduced:
   stage: build
   when: manual
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "reduced"
   script: *script
@@ -73,21 +73,21 @@ build:reduced:
 build:legacy:
   stage: build
   when: manual
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "legacy"
   script: *script
 
 build:cmake:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_buildsys: "cmake-dist"
   script: *script
 
 build:i686-w64-mingw32-debug:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_host: "i686-w64-mingw32"
     ci_variant: "debug"
@@ -96,7 +96,7 @@ build:i686-w64-mingw32-debug:
 build:i686-w64-mingw32-cmake:
   stage: build
   when: manual
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_buildsys: "cmake"
     ci_host: "i686-w64-mingw32"
@@ -104,34 +104,26 @@ build:i686-w64-mingw32-cmake:
 
 build:x86_64-w64-mingw32:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_host: "i686-w64-mingw32"
   script: *script
 
 build:x86_64-w64-mingw32-cmake-debug:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_buildsys: "cmake"
     ci_host: "i686-w64-mingw32"
     ci_variant: "debug"
   script: *script
 
-build:jessie:
+build:stretch:
   when: manual
   stage: build
-  image: "debian:jessie-slim"
+  image: "debian:stretch-slim"
   variables:
-    ci_suite: "jessie"
-  script: *script
-
-build:buster:
-  when: manual
-  stage: build
-  image: "debian:buster-slim"
-  variables:
-    ci_suite: "buster"
+    ci_suite: "stretch"
   script: *script
 
 build:xenial:

.travis.yml

@@ -37,7 +37,6 @@ env:
   - ci_host=i686-w64-mingw32 ci_buildsys=cmake ci_variant=debug
   - ci_host=x86_64-w64-mingw32 ci_variant=debug
   - ci_host=x86_64-w64-mingw32 ci_buildsys=cmake
-  - ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie
   - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch
   - ci_docker=debian:buster-slim ci_distro=debian ci_suite=buster
 

tools/ci-install.sh

@@ -54,6 +54,10 @@ NULL=
 # Typical values for ci_distro=fedora might be 25, rawhide
 : "${ci_suite:=xenial}"
 
+# ci_variant:
+# One of debug, reduced, legacy, production
+: "${ci_variant:=production}"
+
 if [ $(id -u) = 0 ]; then
     sudo=
 else
@@ -119,6 +123,12 @@ case "$ci_distro" in
                 ;;
         esac
 
+        if [ "$ci_host/$ci_variant/$ci_suite" = "native/production/buster" ]; then
+            $sudo apt-get -qq -y --no-install-recommends install \
+                qttools5-dev-tools \
+                ${NULL}
+        fi
+
         $sudo apt-get -qq -y --no-install-recommends install \
             adduser \
             autoconf-archive \