[citemplates/wip/fmuellner/optional-branch] Allow specifying a non-default branch

[Florian Müllner <fmuellner src gnome org>]

commit fd1281c188808c6827ec358465cabab5847c7c08
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Apr 18 15:40:41 2019 +0200

    Allow specifying a non-default branch
    
    As a less-intrusive alternative to alternative application IDs, allow
    to use a dedicated flatpak branch that doesn't conflict with existing
    "master" or "stable" ones.

 flatpak/flatpak_ci_initiative.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/flatpak/flatpak_ci_initiative.yml b/flatpak/flatpak_ci_initiative.yml
index d9e4630..2ede769 100644
--- a/flatpak/flatpak_ci_initiative.yml
+++ b/flatpak/flatpak_ci_initiative.yml
@@ -7,7 +7,7 @@
     # 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 ${BRANCH:+--default-branch=$BRANCH} app ${MANIFEST_PATH}
     # Run automatic tests inside the Flatpak env
     - >
       xvfb-run -a -s "-screen 0 1024x768x24"
@@ -20,7 +20,7 @@
       meson test -C _build --no-stdsplit --print-errorlogs ${TEST_RUN_ARGS}
 
     # Generate a Flatpak bundle
-    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
+    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
   artifacts:
     when: 'always'
     paths: