[pitivi/thiblahute/sdk3.30] ci: Add a target to update our flatpak repository
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/thiblahute/sdk3.30] ci: Add a target to update our flatpak repository
- Date: Wed, 12 Dec 2018 14:20:03 +0000 (UTC)
commit 1d9d0a499a054107b0e70e5f5708e488d88d3fee
Author: Thibault Saunier <tsaunier igalia com>
Date: Thu Dec 6 16:08:16 2018 -0300
ci: Add a target to update our flatpak repository
And export to the Pitivi flatpak from there
.gitlab-ci.yml | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4895f0fb..6c785b13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,14 @@ stages:
- test-results
+variables:
+ BUNDLE: "pitivi.flatpak"
+ MANIFEST: build/flatpak/org.pitivi.Pitivi.json
+ DBUS_ID: org.pitivi.Pitivi
+ BRANCH: master
+
build:
- image: registry.gitlab.gnome.org/gnome/pitivi:master
+ image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.30
stage: build
artifacts:
paths:
@@ -28,6 +34,23 @@ build:
- ${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}
+ - flatpak-builder --disable-rofiles-fuse --finish-only --repo=repo app ${MANIFEST}
+ - flatpak build-bundle --disable-rofiles-fuse repo ${BUNDLE} --runtime-repo=${RUNTIME} ${DBUS_ID}
${BRANCH}
+ cache:
+ paths:
+ - flatpak-cache
+ artifacts:
+ paths:
+ - ${BUNDLE}
+ expire_in: 30 days
+
+deploy:
+ tags:
+ - PitiviBuildMachine
+ stage: deploy
+ script:
+ - flatpak build-import-bundle repo ${BUNDLE}
+
test-results:
image: registry.gitlab.gnome.org/gnome/pitivi:master
stage: test-results
@@ -49,11 +72,11 @@ test-results:
script:
# For debugging
- echo ${BRANCH}
- - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}"
+ - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.30"
- echo ${IMAGE}
- export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
- echo ${BASE_IMAGE}
- - export TMPIMAGENAME="tmp-pitivi-${BRANCH}"
+ - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.30"
- echo ${TMPIMAGENAME}
# Not using a Dockerfile because we need the container to be privileged to run flatpak inside of it
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]