[gnome-weather/wip/christopherdavis/publish-nightly] CI: Make full use of template and publish nightly

[Christopher Davis <christopherdavis src gnome org>]

commit ffb975b9664f7e4348f9174a74980be8770ae93b
Author: Christopher Davis <brainblasted disroot org>
Date:   Mon Oct 21 18:44:05 2019 -0700

    CI: Make full use of template and publish nightly
    
    Nightlies are now published with CI; Previously we also
    were duplicating work from the CI template in order to
    get around building the dogtail tests. Now we don't need that workaround.

 .gitlab-ci.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b21c451..c8d219a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,16 +8,23 @@ flatpak:
     variables:
         MANIFEST_PATH: "org.gnome.Weather.json"
         FLATPAK_MODULE: "gnome-weather"
-        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
         APP_ID: "org.gnome.WeatherDevel"
         MESON_ARGS: "-Dprofile=development"
     extends: .flatpak
-    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 ${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} ${APP_ID}
+
+review:
+    stage: deploy
+    dependencies:
+      - flatpak
+    extends: .review
+
+stop_review:
+    stage: deploy
+    extends: .stop_review
+
+nightly:
+  extends: '.publish_nightly'
+  only:
+    refs:
+      - master