[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:06:57 +0000 (UTC)
commit 49aaacec259bae0263fb11e6704292632fe23f12
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 | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84a54698..f50bf4a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,23 +2,41 @@ stages:
- build
- deploy
+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/gnome-runtime-images/gnome:3.30
stage: build
script:
- export XUNIT_PATH=${CI_PROJECT_DIR}/xunit.xml
- - export MANIFEST=${CI_PROJECT_DIR}/build/flatpak/org.pitivi.Pitivi.json
- - export RUN_IN_SANDBOX="flatpak-builder --filesystem=${CI_PROJECT_DIR} --env=PITIVI_DEVELOPMENT=1 --run
app ${MANIFEST}"
+ - export RUN_IN_SANDBOX="flatpak-builder --disable-rofiles-fuse --filesystem=${CI_PROJECT_DIR}
--env=PITIVI_DEVELOPMENT=1 --run app ${MANIFEST}"
+ - env
# Working around the fact that flatpak-builder *requires* the cache dir
# to be on the same filesystem as the build dir
- export FLATPAK_BUILDER_CACHE="--state-dir=${CI_PROJECT_DIR}/flatpak-cache"
- - mkdir -p ${CI_PROJECT_DIR}
- flatpak-builder ${FLATPAK_BUILDER_CACHE} --disable-rofiles-fuse --ccache --force-clean app
build/flatpak/org.pitivi.Pitivi.json
- ${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}
+ - 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}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]