[gegl] gitlab-ci: Cleanup

[Øyvind "pippin" Kolås <ok src gnome org>]

commit 2cbe5bca977405ee1c50369d9b2ebabb86a90ee9
Author: Jan Vesely <jano vesely gmail com>
Date:   Thu Apr 30 13:00:30 2020 -0400

    gitlab-ci: Cleanup
    
    Let meson create the babl build dir.
    Use gegl-prefix consistently.
    Use exported version of LD_LIRBARY_PATH.
    Pass PKG_CONFIG_PATH to meson config instead of using env var.
    Drop install prefix.
    Add comment explaining XDG_DATA_DIRS.
    Explicitly create '.docker' dir in kaniko home.

 .gitlab-ci.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaa1092d8..03d1b7b3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ build-image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
   script:
+    - mkdir -p /kaniko/.docker
     - echo 
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" 
> /kaniko/.docker/config.json
     - echo "FROM archlinux/base:latest" >> Dockerfile
     - echo "RUN pacman -Syu --noconfirm --needed git base-devel ccache meson" >> Dockerfile
@@ -51,7 +52,6 @@ build-image:
     - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE git base-devel ccache meson lcms2 
gobject-introspection
     - git clone --depth=$GIT_DEPTH https://gitlab.gnome.org/GNOME/babl.git _babl
     - cd _babl
-    - mkdir _build
     - ccache -z
 
 babl-master:
@@ -106,30 +106,29 @@ babl-min:
         vala
     - ccache -z
 
-.build-gegl:
+.gegl-build:
   stage: gegl
   extends: .gegl-deps
   variables:
     GIT_DEPTH: "15"
     CCACHE_MAXSIZE: "128Mi"
   script:
+   # Add babl location to XDG_DATA_DIRS. .gir files are located there.
+   # Add /usr/local/share:/usr/share for vapigen.
    - export XDG_DATA_DIRS="$XDG_DATA_DIRS:$BABL_PREFIX/share:/usr/local/share/:/usr/share/"
-   - export PKG_CONFIG_PATH=$BABL_PREFIX/lib/pkgconfig
    - export LD_LIBRARY_PATH="$BABL_PREFIX/lib:$LD_LIBRARY_PATH"
-   - meson -Dprefix="$BABL_PREFIX" $CONFIG_OPTIONS _build
-   - LD_LIBRARY_PATH="$BABL_PREFIX/lib:$LD_LIBRARY_PATH"
-     ninja -C _build
+   - meson -Dpkg_config_path=$BABL_PREFIX/lib/pkgconfig $CONFIG_OPTIONS _build
+   - ninja -C _build
    - ccache -s
-   - LD_LIBRARY_PATH="$BABL_PREFIX/lib:$LD_LIBRARY_PATH"
-     meson test -C _build --print-errorlogs
+   - meson test -C _build --print-errorlogs
 
 .build-default:
-  extends: .build-gegl
+  extends: .gegl-build
   variables:
     CONFIG_OPTIONS: ""
 
 .build-all:
-  extends: .build-gegl
+  extends: .gegl-build
   variables:
     CONFIG_OPTIONS: "-Dworkshop=true -Ddocs=true -Dintrospection=true"