[gnome-music/wip/jfelder/update-ci-nightly: 1/3] CI: use the flatpak CI intiative template



commit 9e7af8b26cb4965cf1e88706c32b460a5a52ba7b
Author: Jean Felder <jfelder src gnome org>
Date:   Thu Sep 19 12:12:01 2019 +0200

    CI: use the flatpak CI intiative template

 .gitlab-ci.yml | 50 ++++++++------------------------------------------
 1 file changed, 8 insertions(+), 42 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa7e6cb9..f099fd0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,63 +1,29 @@
-image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
 stages:
   - check
-  - build-flatpak
   - deploy
 
 variables:
   BUNDLE: "gnome-music-dev.flatpak"
-  DBUS_ID: "org.gnome.MusicDevel"
+  APP_ID: "org.gnome.MusicDevel"
   FLATPAK_MODULE: "gnome-music"
   GIT_SUBMODULE_STRATEGY: normal
   MANIFEST_PATH: "org.gnome.Music.json"
   RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
 
 flatpak:
-  stage: build-flatpak
-  script:
-    - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-    - flatpak build app meson --prefix=/app -Dprofile=development _build
-    - flatpak build app ninja -C _build install
-    - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
-    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
-  artifacts:
-    paths:
-      - ${BUNDLE}
-      - _build/meson-logs/meson-log.txt
-    expire_in: 2 days
-  cache:
-    paths:
-      - .flatpak-builder/cache
+    extends: .flatpak
+    variables:
+        MESON_ARGS: "-Dprofile=development"
 
 review:
-    stage: deploy
+    extends: .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-music
-        - tags
 
 stop_review:
-    stage: deploy
-    script:
-        - echo "Stopping flatpak deployment"
-    when: manual
-    environment:
-        name: review/$CI_COMMIT_REF_NAME
-        action: stop
-    except:
-        - master@GNOME/gnome-music
-        - tags
+    extends: .stop_review
 
 flake8:
   stage: check


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]