diff options
| author | Abderrahim Kitouni <akitouni@gnome.org> | 2019-07-19 18:25:38 +0100 |
|---|---|---|
| committer | Abderrahim Kitouni <a.kitouni@gmail.com> | 2019-07-19 21:11:49 +0000 |
| commit | 662b22c7560aa1fada8b853745d63fc377af7f80 (patch) | |
| tree | 0750edfc5a7f6c0d9d21dca91cc991571a8c1d8c | |
| parent | a54db0efe6904f329aba71b43bcf37baec193fbc (diff) | |
| download | epiphany-662b22c7560aa1fada8b853745d63fc377af7f80.tar.gz | |
use different meson args between master and other branches
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files 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' |