From: Jan Vesely <jano.vesely@gmail.com>
Date: Sun, 5 May 2019 02:14:26 +0000 (-0400)
Subject: gitlab-ci: Consolidate pacman setup and cache downloaded pacman packages
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~116
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41b8019554971e00d81282729ba76be6439eb010;p=babl.git

gitlab-ci: Consolidate pacman setup and cache downloaded pacman packages

Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bca1a79..414fc1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,15 @@
+cache:
+  paths:
+    - _pacman_cache
+
 .build:
   stage: build
   image: archlinux/base:latest
+  before_script:
+    - pacman -Syu --noconfirm --needed --cachedir `pwd`/_pacman_cache
+        base-devel
+        git
+        ${EXTRA_PKGS}
 
 .meson-build:
   extends: .build
@@ -48,39 +57,21 @@ latest-meson-lcms:
   extends: .meson-build
   variables:
     LCMS_OPTION : "-Dwith-lcms=true"
-  before_script:
-    - pacman -Syu --noconfirm --needed
-        base-devel
-        meson
-        lcms2
-        git
+    EXTRA_PKGS: "lcms2 meson"
 
 latest-meson-nolcms:
   extends: .meson-build
   variables:
     LCMS_OPTION : "-Dwith-lcms=false"
-  before_script:
-    - pacman -Syu --noconfirm --needed
-        base-devel
-        meson
-        lcms2
-        git
+    EXTRA_PKGS: "meson"
 
 latest-autotools-lcms:
   extends: .autotools-build
   variables:
     LCMS_OPTION : "--with-lcms"
-  before_script:
-    - pacman -Syu --noconfirm --needed
-        base-devel
-        lcms2
-        git
+    EXTRA_PKGS: "lcms2"
 
 latest-autotools-nolcms:
   extends: .autotools-build
   variables:
     LCMS_OPTION : "--without-lcms"
-  before_script:
-    - pacman -Syu --noconfirm --needed
-        base-devel
-        git