Minor fix for the license of tests package

[platform/upstream/dbus.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d632d..5c88527 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ before_script:
   - export PATH="/usr/lib/ccache:$PATH"
 
 cache:
+  key: dbus-1.12-${CI_JOB_NAME}
   paths:
     - .ccache/
 
@@ -63,6 +64,7 @@ build:debug:
 
 build:reduced:
   stage: build
+  when: manual
   image: "debian:stretch-slim"
   variables:
     ci_variant: "reduced"
@@ -70,6 +72,7 @@ build:reduced:
 
 build:legacy:
   stage: build
+  when: manual
   image: "debian:stretch-slim"
   variables:
     ci_variant: "legacy"
@@ -82,61 +85,63 @@ build:cmake:
     ci_buildsys: "cmake"
   script: *script
 
-build:i686-w64-mingw32:
+build:i686-w64-mingw32-debug:
   stage: build
   image: "debian:stretch-slim"
   variables:
     ci_host: "i686-w64-mingw32"
+    ci_variant: "debug"
   script: *script
 
-build:i686-w64-mingw32-cmake-debug:
+build:i686-w64-mingw32-cmake:
   stage: build
+  when: manual
   image: "debian:stretch-slim"
   variables:
     ci_buildsys: "cmake"
     ci_host: "i686-w64-mingw32"
-    ci_variant: "debug"
   script: *script
 
-build:x86_64-w64-mingw32-debug:
+build:x86_64-w64-mingw32:
   stage: build
   image: "debian:stretch-slim"
   variables:
     ci_host: "i686-w64-mingw32"
-    ci_variant: "debug"
   script: *script
 
-build:x86_64-w64-mingw32-cmake:
+build:x86_64-w64-mingw32-cmake-debug:
   stage: build
+  when: manual
   image: "debian:stretch-slim"
   variables:
     ci_buildsys: "cmake"
     ci_host: "i686-w64-mingw32"
+    ci_variant: "debug"
   script: *script
 
 build:jessie:
+  when: manual
   stage: build
   image: "debian:jessie-slim"
   variables:
     ci_suite: "jessie"
   script: *script
 
-build:xenial:
+build:buster:
+  when: manual
   stage: build
-  image: "ubuntu:xenial"
+  image: "debian:buster-slim"
   variables:
-    ci_distro: "ubuntu"
-    ci_suite: "xenial"
+    ci_suite: "buster"
   script: *script
 
-build:trusty:
+build:xenial:
+  when: manual
   stage: build
-  image: "ubuntu:trusty"
+  image: "ubuntu:xenial"
   variables:
     ci_distro: "ubuntu"
-    ci_suite: "trusty"
-  script:
-    - chown -R user .
-    - sudo -u user -H ./tools/ci-build.sh
+    ci_suite: "xenial"
+  script: *script
 
 # vim:set sw=2 sts=2 et: