From a97bad1cbebbb728a6e59adeeb9a59538f1f9a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 9 Aug 2019 16:18:43 +0200
Subject: [PATCH] Update gitlab-ci

---
 .gitlab-ci.yml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d877d856f8..fd49bbe47f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: archlinux/base:latest
+image: salamandar/archlinux-gimp:latest
 
 stages:
   - babl
@@ -178,12 +178,38 @@ gegl-git:
     paths:
       - _build/app/tests/
 
+.gimp-meson:
+  extends: .gimp-base
+  script:
+      # Archlinux fix
+    - sed -i "s|'libmypaint'|'libmypaint-1.3'|g" meson.build
+    - meson _build
+      --prefix="${INSTALL_PREFIX}"
+      -Dpython=always
+      -Djavascript=always
+      -Dlua=always
+    - ninja -C _build
+    # - ninja test
+  artifacts:
+    name: "app-tests-logs-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: on_failure
+    expire_in: 1 week
+    paths:
+      - _build/app/tests/
+
+
 build-git-autotools:
   extends: .gimp-autotools
   dependencies:
     - babl-git
     - gegl-git
 
+build-git-meson:
+  extends: .gimp-meson
+  dependencies:
+    - babl-git
+    - gegl-git
+
 # build-min-autotools:
 #   extends: .gimp-autotools
 #   dependencies: