[epiphany/abderrahim/flat-manager: 2/2] use different meson args between master and other branches



commit 182016dcb2f716cb4ac950318c5bc7108c1866fa
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Jul 19 18:25:38 2019 +0100

    use different meson args between master and other branches

 .gitlab-ci.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c0f18937..07798b2e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,15 +16,28 @@ check-code-style:
 variables:
   BUNDLE: 'epiphany-git.flatpak'
 
-flatpak:
+.flatpak-template:
   extends: '.flatpak'
   variables:
     MANIFEST_PATH: 'org.gnome.Epiphany.json'
     RUNTIME_REPO: 'https://sdk.gnome.org/gnome-nightly.flatpakrepo'
     FLATPAK_MODULE: 'epiphany'
-    MESON_ARGS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
     APP_ID: 'org.gnome.Epiphany.Devel'
 
+flatpak:
+  extends: '.flatpak-template'
+  variables:
+    MESON_ARGS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
+  except:
+    - master
+
+flatpak-master:
+  extends: '.flatpak-template'
+  variables:
+    MESON_ARGS: '-Dtech_preview=true -Dprofile=Devel'
+  only:
+    - master
+
 review:
   dependencies:
     - 'flatpak'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]