From e263eeabbe5dc92f51440727259e4dcfad8cba9f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 15 Jun 2021 19:26:42 +0100
Subject: [PATCH] CI: Separate devel and clang-asan builds

This build pass takes long enough that it makes sense to parallelize.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 debian/gitlab-ci.yml | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index eba6f0e0e..4ca3d78b0 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -117,20 +117,43 @@ build:devel:
         - |
             set -eux
 
-            apt-get -y --no-install-recommends install \
-            clang \
-            clang-tools \
-            ${NULL+}
-
             mkdir -p -m700 "${STEAM_CI_TMPDIR}"
             export TMPDIR="${STEAM_CI_TMPDIR}"
 
             mkdir -p _build
-            meson --werror -Dman=true _build/devel
+            meson \
+                -Dman=true \
+                --werror \
+                _build/devel
             ninja -C _build/devel
             ninja -C _build/devel install
             meson test --verbose -C _build/devel
 
+    artifacts:
+        paths:
+            - _build/devel/meson-logs/*.txt
+        when: always
+
+build:clang:
+    stage: build
+    tags:
+        - docker
+        - linux
+    rules:
+        - if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
+    image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
+    script:
+        - |
+            set -eux
+
+            apt-get -y --no-install-recommends install \
+            clang \
+            clang-tools \
+            ${NULL+}
+
+            mkdir -p -m700 "${STEAM_CI_TMPDIR}"
+            export TMPDIR="${STEAM_CI_TMPDIR}"
+
             export CC=clang
             export CXX=clang++
 
@@ -146,7 +169,6 @@ build:devel:
 
     artifacts:
         paths:
-            - _build/devel/meson-logs/*.txt
             - _build/clang-asan/meson-logs/*.txt
         when: always
 
-- 
GitLab