From: Jan Vesely <jano.vesely@gmail.com>
Date: Tue, 25 Feb 2020 18:15:39 +0000 (-0500)
Subject: gitlab-ci: Cleanup
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~9^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58c7ab5db73e3fd6509db7620a42726a11bb3c3b;p=babl.git

gitlab-ci: Cleanup

We only use meson now
Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ded2774..31fbf88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,19 +5,17 @@ cache:
 .build:
   stage: build
   image: archlinux/base:latest
+  artifacts:
+    when: always
+    paths:
+      - _build/meson-logs
   before_script:
     - pacman -Syu --noconfirm --needed --cachedir `pwd`/_pacman_cache
         base-devel
         git
         gobject-introspection
+        meson
         ${EXTRA_PKGS}
-
-.meson-build:
-  extends: .build
-  artifacts:
-    when: always
-    paths:
-      - _build/meson-logs
   script:
     - meson _build
         -D enable-f16c=true
@@ -27,18 +25,18 @@ cache:
         -D enable-sse3=true
         -D enable-sse4_1=true
         -D with-docs=true
-        ${LCMS_OPTION}
+        ${EXTRA_OPTIONS}
     - ninja -C _build
     - ninja -C _build test
 
-latest-meson-lcms:
-  extends: .meson-build
+latest-lcms:
+  extends: .build
   variables:
-    LCMS_OPTION : "-Dwith-lcms=true"
-    EXTRA_PKGS: "lcms2 meson"
+    EXTRA_OPTIONS : "-Dwith-lcms=true"
+    EXTRA_PKGS: "lcms2"
 
-latest-meson-nolcms:
-  extends: .meson-build
+latest-nolcms:
+  extends: .build
   variables:
-    LCMS_OPTION : "-Dwith-lcms=false"
-    EXTRA_PKGS: "meson"
+    EXTRA_OPTIONS : "-Dwith-lcms=false"
+    EXTRA_PKGS: ""