summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jpetridis@gnome.org>2020-08-04 16:29:28 +0000
committerJordan Petridis <jpetridis@gnome.org>2020-08-04 16:29:28 +0000
commit16b08e49ee17dba9a43d9719277e5e3ee97bf215 (patch)
treef01f42cfd0c03effdce71e2ff10e2301fce1d132
parent574a2cd307a4ddcf89a9a05ecf605c5afc0e06f8 (diff)
parent6bee32e200b0d246737ae36857d929b5c307bd12 (diff)
downloadgnome-font-viewer-16b08e49ee17dba9a43d9719277e5e3ee97bf215.tar.gz
Merge branch 'alatiera/flatpak-template' into 'master'
ci: port to the shared flatpak template See merge request GNOME/gnome-font-viewer!16
-rw-r--r--.gitlab-ci.yml29
1 files changed, 7 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ef96ed..befb351 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,16 @@
-stages:
- - build
-
-variables:
- BUNDLE: 'org.gnome.font-viewerDevel.flatpak'
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
flatpak:
+ extends: '.flatpak'
image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
- stage: 'build'
variables:
MANIFEST_PATH: 'flatpak/org.gnome.font-viewerDevel.json'
- MESON_ARGS: '-Dprofile=development'
RUNTIME_REPO: 'https://sdk.gnome.org/gnome-nightly.flatpakrepo'
FLATPAK_MODULE: 'gnome-font-viewer'
APP_ID: 'org.gnome.font-viewerDevel'
- script:
- - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
- - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
- - flatpak build app ninja -C _build install
- - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
- - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
+ BUNDLE: 'org.gnome.font-viewerDevel.flatpak'
- artifacts:
- paths:
- - ${BUNDLE}
- - _build/meson-logs/meson-log.txt
- expire_in: 7 days
- cache:
- paths:
- - .flatpak-builder/downloads
- - .flatpak-builder/git
+nightly:
+ extends: '.publish_nightly'
+ dependencies: ['flatpak']
+ needs: ['flatpak']