[gnome-photos/abderrahim/update-citemplate] CI: Use the new template

[Debarshi Ray <debarshir src gnome org>]

commit 7b445a63f93f49a554661d789a468ac2542397f2
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Mar 28 15:08:47 2020 +0100

    CI: Use the new template
    
    https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/123

 .gitlab-ci.yml | 82 ++++++++--------------------------------------------------
 1 file changed, 11 insertions(+), 71 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 540fe740..e1df517d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,79 +1,19 @@
-stages:
-- test
-- review
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 variables:
-    BUNDLE: "org.gnome.Photos.Devel.flatpak"
     GIT_SUBMODULE_STRATEGY: recursive
 
 flatpak:
-    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-    stage: test
+    image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
     variables:
         MANIFEST_PATH: "flatpak/org.gnome.Photos.json"
-        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
-        # Replace with your application name, as written in the manifest
+        MESON_ARGS: "-Ddogtail=false -Dinstalled_tests=true"
         FLATPAK_MODULE: "gnome-photos"
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        CONFIGURE_ARGS: "-Ddogtail=false -Dinstalled_tests=true"
-        DBUS_ID: "org.gnome.Photos"
-
-    script:
-        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-
-        # 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 ${CONFIGURE_ARGS} _build
-        - flatpak build app ninja -C _build install
-
-        - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
-
-        # Run automatic tests inside the Flatpak env
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
-
-        # Generate a Flatpak bundle
-        - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
-
-    artifacts:
-        paths:
-            - ${BUNDLE}
-            - _build/meson-logs/meson-log.txt
-            - _build/meson-logs/testlog.txt
-        expire_in: 2 days
-    cache:
-        paths:
-            - .flatpak-builder/downloads
-            - .flatpak-builder/git
-
-review:
-    stage: review
-    dependencies:
-        - flatpak
-    script:
-        - echo "Generating flatpak deployment"
-    artifacts:
-        paths:
-            - ${BUNDLE}
-        expire_in: 30 days
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}
-        on_stop: stop_review
-    except:
-        - master@GNOME/gnome-photos
-        - tags
-        - gnome-3-.*
-
-stop_review:
-    stage: review
-    script:
-        - echo "Stopping flatpak deployment"
-    when: manual
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        action: stop
-    except:
-        - master@GNOME/gnome-photos
-        - tags
-        - gnome-3-.*
+        APP_ID: "org.gnome.Photos"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+        BUNDLE: "org.gnome.Photos.Devel.flatpak"
+    extends: .flatpak
+
+nightly:
+  extends: '.publish_nightly'
+  dependencies: ['flatpak']