[gnome-todo/wip/christopherdavis/flatpak-dual-install: 18/18] CI: remove custom scripts; use initiative template

[Christopher Davis <christopherdavis src gnome org>]

commit 5e1f510188b9250ab53ba3c928256cc8923941b5
Author: Christopher Davis <brainblasted disroot org>
Date:   Mon Dec 10 07:19:22 2018 -0500

    CI: remove custom scripts; use initiative template
    
    The CI previously used a set of custom scripts to rename Todo to
    TodoDevel for the purposes of generating CI bundles. With the changes
    for paralell these scripts are obsolete.
    
    Instead of using the custom scripts, the CI uses the template from
    the flatpak CI initiative.

 .gitlab-ci.yml                       | 32 +++++++-----
 build-aux/ci/build-flatpak-bundle.sh |  9 ----
 build-aux/ci/debug.sh                | 52 -------------------
 build-aux/ci/setup.sh                | 97 ------------------------------------
 4 files changed, 20 insertions(+), 170 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34d3a42..cd38d21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,6 @@ stages:
    - build
    - review
 
-variables:
-    DEVELOPMENT_FLATPAK_ID: "TodoDevel"
-
 
 ##################
 # Fedora Rawhide #
@@ -65,21 +62,32 @@ ubuntu:devel:
 flatpak:master:
     image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
     stage: flatpak
+    
+    variables:
+        MANIFEST_PATH: "build-aux/flatpak/org.gnome.Todo.json"
+        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
+        # Replace with your application name, as written in the manifest
+        FLATPAK_MODULE: "gnome-todo"
+        # 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: "-Dtracing=true -Dprofile=development"
+        DBUS_ID: "org.gnome.TodoDevel"
+        BUNDLE: "org.gnome.TodoDevel.flatpak"
 
     script:
-    # Print debug information
-    - build-aux/ci/debug.sh environment
-    - build-aux/ci/debug.sh git
-
-    # Setup the current directory
-    - build-aux/ci/setup.sh $DEVELOPMENT_FLATPAK_ID $CI_COMMIT_SHA
+        - 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}
+        # Generate a Flatpak bundle
+        - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
+        # Run automatic tests inside the Flatpak env
+        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
 
-    # Build and generate the bundle
-    - build-aux/ci/build-flatpak-bundle.sh $DEVELOPMENT_FLATPAK_ID
 
     artifacts:
         paths:
-        - org.gnome.$DEVELOPMENT_FLATPAK_ID.flatpak
+        - ${BUNDLE}
         expire_in: 3 days
     cache:
         paths: