From: Simon McVittie <smcv@collabora.com>
Date: Mon, 6 Apr 2020 13:48:11 +0000 (+0100)
Subject: CI: Build on Debian 10 'buster' by default
X-Git-Tag: dbus-1.12.22~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32b27f273aa33b1e8b32fffefcbbfe923853a1fc;p=thirdparty%2Fdbus.git

CI: Build on Debian 10 'buster' by default

Previously, we built on Debian 9 'stretch' by default, and on
Debian 10 'buster' only on request. Let's reverse that so that we get
more modern toolchains, before Debian 9 'stretch' reaches EOL.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 73cfcb95c6f122b741a56450036c865807a4d64f)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e65c1e0f..583f05ec8 100644
--- a/.gitlab-ci.yml
+++ b/.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
@@ -45,11 +45,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
@@ -58,7 +58,7 @@ build:production:
 
 build:debug:
   stage: build
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "debug"
   script: *script
@@ -66,7 +66,7 @@ build:debug:
 build:reduced:
   stage: build
   when: manual
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_variant: "reduced"
   script: *script
@@ -74,21 +74,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"
@@ -97,7 +97,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"
@@ -105,7 +105,7 @@ 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
@@ -113,7 +113,7 @@ build:x86_64-w64-mingw32:
 build:x86_64-w64-mingw32-cmake-debug:
   stage: build
   when: manual
-  image: "debian:stretch-slim"
+  image: "debian:buster-slim"
   variables:
     ci_buildsys: "cmake"
     ci_host: "i686-w64-mingw32"
@@ -128,12 +128,12 @@ build:jessie:
     ci_suite: "jessie"
   script: *script
 
-build:buster:
+build:stretch:
   when: manual
   stage: build
-  image: "debian:buster-slim"
+  image: "debian:stretch-slim"
   variables:
-    ci_suite: "buster"
+    ci_suite: "stretch"
   script: *script
 
 build:xenial: