[gnome-clocks/wip/christopherdavis/flatpak-dual-install] CI: Use template for flatpak CI



commit a2be27270d319eff3cce71d0f6d0954431bc5c13
Author: Christopher Davis <brainblasted disroot org>
Date:   Sun Dec 23 01:08:43 2018 -0500

    CI: Use template for flatpak CI
    
    There's a new template that we can base our CI off of instead of
    doing everything manually.

 .gitlab-ci.yml | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b693573..e80a514 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,14 @@
-stages:
-  - build
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 variables:
-  BUNDLE: "org.gnome.Clocks.Devel.flatpak"
+    BUNDLE: "nautilus-dev.flatpak"
 
 flatpak:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  stage: build
-  variables:
-    MANIFEST_PATH: "data/flatpak/org.gnome.clocks.json"
-    MESON_ARGS: "-Dprofile=development"
-    RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
-    FLATPAK_MODULE: "gnome-clocks"
-    DBUS_ID: "org.gnome.clocks"
-  script:
-    - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-    - flatpak build app meson --prefix=/app -Dprofile=development ${MESON_ARGS} _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: 30 days
-  cache:
-    paths:
-      - .flatpak-builder/downloads
-      - .flatpak-builder/git
+    image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
+    variables:
+        MANIFEST_PATH: "data/flatpak/org.gnome.clocks.json"
+        MESON_ARGS: "-Dprofile=development"
+        FLATPAK_MODULE: "gnome-clocks"
+        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
+        APP_ID: "org.gnome.clocksDevel"
+    extends: .flatpak


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