From 3615a6cf81dee17705c3e511471f147b3c6378b3 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Fri, 27 Sep 2019 15:08:20 +0000
Subject: [PATCH] Gitlab CI: use sdk extensions template

---
 .gitlab-ci.yml | 62 ++++++--------------------------------------------
 1 file changed, 7 insertions(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8a1dde..50cfb08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,76 +1,28 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak-ci-initiative-sdk-extensions.yml'
 stages:
   - lint
   - test
-  - review
+  - deploy
 
 variables:
     BUNDLE: "obfuscate-nightly.flatpak"
 
 flatpak:
     image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master"
-    stage: "test"
+    extends: '.flatpak'
     variables:
         MANIFEST_PATH: "build-aux/com.belmoussaoui.Obfuscate.Devel.json"
         FLATPAK_MODULE: "obfuscate"
         MESON_ARGS: "-Dprofile=development"
         APP_ID: "com.belmoussaoui.Obfuscate.Devel"
 
-    script:
-        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        # Build the flatpak repo
-        - flatpak-builder --run app ${MANIFEST_PATH} meson --prefix=/app ${MESON_ARGS} _build
-        - flatpak-builder --run app ${MANIFEST_PATH} ninja -C _build install
-
-        # Create a flatpak bundle
-        - flatpak-builder --finish-only app ${MANIFEST_PATH}
-        - >
-          xvfb-run -a -s "-screen 0 1024x768x24"
-          flatpak build
-          --env=LANG=C.UTF-8
-          --env=NO_AT_BRIDGE=1
-          app
-          dbus-run-session
-          meson test -C _build --no-stdsplit --print-errorlogs
-
-        - flatpak build-export repo app
-        - flatpak build-bundle repo ${BUNDLE} ${APP_ID}
-
-    artifacts:
-        paths:
-            - $BUNDLE
-        expire_in: 5 days
-
-    cache:
-        key: "flatpak"
-        paths:
-          - .flatpak-builder/downloads/
-          - .flatpak-builder/git/
-          - target/
-          - target_test/
-
 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
+        - flatpak  
+    extends: '.review'
 
-stop_review:
-    stage: review
-    script:
-        - echo "Stopping flatpak deployment"
-    when: manual
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        action: stop
+stop_review:  
+    extends: '.stop_review'
 
 # Configure and run rustfmt
 # Exits and builds fails if on bad format
-- 
GitLab