summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorNiels De Graef <nielsdegraef@gmail.com>2020-01-05 22:52:02 +0100
committerNiels De Graef <nielsdegraef@gmail.com>2020-01-06 00:05:41 +0100
commit543999ff4375ace548c227440e6d59e4be97b7ed (patch)
treedf633672859834e4f6ad2308511031bec97bbfc3 /.gitlab-ci.yml
parent21a14406f949ef857097502d97913d03a4a4306c (diff)
downloadgnome-contacts-543999ff4375ace548c227440e6d59e4be97b7ed.tar.gz
ci: Use the nigtly flatpak template
We lose the JUnit report integration, but that's a small disadvantage compared to the advantages we get instead.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml43
1 files changed, 15 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db84f03..19a11a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,18 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
stages:
- - build-flatpak
+- test
+- deploy
+
+variables:
+ BUNDLE: 'gnome-contacts.flatpak'
-# We always use flatpak-builder to check if everything still works.
-flatpak:master:
+flatpak:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
- stage: build-flatpak
- script:
- - flatpak-builder --stop-at=gnome-contacts app data/flatpak/org.gnome.Contacts.json
- # Make sure to keep this in sync with the Flatpak manifest, all arguments
- # are passed except the config-args because we build it ourselves
- - flatpak build app meson --prefix=/app _build
- - flatpak build app ninja -C _build test
- - flatpak build app ninja -C _build install
- - flatpak-builder --finish-only --repo=repo app data/flatpak/org.gnome.Contacts.json
- # Make a Flatpak Contacts bundle for people to test
- - flatpak build-bundle repo contacts-dev.flatpak --runtime-repo=https://sdk.gnome.org/gnome-nightly.flatpakrepo org.gnome.Contacts
- # Run the tests
- - bash +x ./.gitlab-ci/run-tests.sh
- artifacts:
- reports:
- junit: "_build/${CI_JOB_NAME}-report.xml"
- name: "gnome-contacts-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
- when: always
- paths:
- - contacts-dev.flatpak
- - _build/meson-logs/
- expire_in: 14 days
- cache:
- paths:
- - .flatpak-builder/cache
+ variables:
+ MANIFEST_PATH: 'data/flatpak/org.gnome.Contacts.json'
+ MESON_ARGS: "-Dprofile=development"
+ FLATPAK_MODULE: "gnome-contacts"
+ RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+ APP_ID: "org.gnome.Contacts.Devel"
+ extends: .flatpak