[pitivi/thiblahute/sdk3.30] WIP

[Thibault Saunier <tsaunier src gnome org>]

commit 4dcc31d6558bbce0bf009e51a48ca81dffb6f90e
Author: Thibault Saunier <tsaunier igalia com>
Date:   Sat Jan 12 13:38:06 2019 -0300

    WIP

 .gitlab-ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb67a887..5cae94de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@ stages:
   - deploy
 
 variables:
-  BUNDLE: "pitivi.flatpak"
   MANIFEST: build/flatpak/org.pitivi.Pitivi.json
   DBUS_ID: org.pitivi.Pitivi
   XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
@@ -27,20 +26,20 @@ build:
     - mkdir -p ${CI_PROJECT_DIR}
 
     - cd ${BUILDDIR}
-    - flatpak-builder ${FLATPAK_BUILDER_CACHE} --ccache --repo=repo --force-clean app 
build/flatpak/org.pitivi.Pitivi.json
+    - flatpak-builder ${FLATPAK_BUILDER_CACHE} --ccache --repo=${CI_PROJECT_DIR}/repo --force-clean app 
build/flatpak/org.pitivi.Pitivi.json --subject="Rolling update for pitivi master" --body="See ${CI_JOB_URL}"
     - ${RUN_IN_SANDBOX} meson mesonbuild/
     - ${RUN_IN_SANDBOX} ninja -C mesonbuild/
     - xvfb-run -n 32 -s "-screen 0 640x480x24" ${RUN_IN_SANDBOX} gst-validate-launcher 
$PWD/tests/ptv_testsuite.py --dump-on-failure --timeout-factor 4 --xunit-file ${XUNIT_PATH} 
--logs-dir=${CI_PROJECT_DIR}/tests-logs
-
-    - flatpak build-bundle repo ${CI_PROJECT_DIR}/${BUNDLE} --runtime-repo=${RUNTIME} ${DBUS_ID} ${BRANCH}
-    - ls -hls
+    - cd ${CI_PROJECT_DIR}
+    - tar cf repo.tar repo
+    - du -h --max-depth=1 ${CI_PROJECT_DIR}/
   cache:
     paths:
     - flatpak-cache
   artifacts:
     expire_in: 30 days
     paths:
-    - ${BUNDLE}
+    - repo.tar
     - tests-logs/
     reports:
       junit:
@@ -51,7 +50,11 @@ deploy:
     - PitiviBuildMachine
   stage: deploy
   script:
-    - flatpak build-import-bundle /srv/http/ ${BUNDLE}
+    - tar -xvf repo.tar
+    - ostree gpg-sign app/org.pitivi.Pitivi/x86_64/master 739E841A
+    - export BUILT_REPO=$PWD/repo/
+    - cd /srv/http/
+    - ostree pull-local $BUILT_REPO app/org.pitivi.Pitivi/x86_64/master
   only:
     - master@GNOME/pitivi
     - 1.0@GNOME/pitivi