[polari/wip/fmuellner/ci-snapshots: 9/9] ci: Build flatpak bundle as snapshot
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari/wip/fmuellner/ci-snapshots: 9/9] ci: Build flatpak bundle as snapshot
- Date: Fri, 3 Aug 2018 20:06:58 +0000 (UTC)
commit fc39327b26b702237b2738006dfe31f7fc59883b
Author: Florian Müllner <fmuellner gnome org>
Date: Wed Jul 25 19:15:11 2018 +0200
ci: Build flatpak bundle as snapshot
With everything in place, update the flatpak CI job to use a
'snapshot' build in the produced bundle, and make it available
as org.gnome.Polari/snapshot to avoid conflicts with the night-
ly flatpak.
https://gitlab.gnome.org/GNOME/polari/issues/61
.gitlab-ci.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0768b3..28f9ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,10 @@ flatpak:
MANIFEST_PATH: "flatpak/org.gnome.Polari.json"
RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
FLATPAK_MODULE: "polari"
+ BRANCH: "snapshot"
# Make sure to keep this in sync with the Flatpak manifest, all arguments
# are passed except the config-args because we build it ourselves
- MESON_ARGS: ""
+ MESON_ARGS: "-Dsnapshot=true"
DBUS_ID: "org.gnome.Polari"
before_script:
@@ -26,11 +27,11 @@ flatpak:
# are passed except the config-args because we build it ourselves
- 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-builder --finish-only --repo=repo --default-branch=${BRANCH} app ${MANIFEST_PATH}
# Run automatic tests inside the Flatpak env
- flatpak build app ninja -C _build test
# Generate a Flatpak bundle
- - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
+ - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID} ${BRANCH}
after_script:
- tar -czf cache.tar.gz .flatpak-builder/cache
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]