[pitivi/thiblahute/sdk3.30: 15/15] WIP
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/thiblahute/sdk3.30: 15/15] WIP
- Date: Mon, 14 Jan 2019 14:19:15 +0000 (UTC)
commit c15c0cb2f30d8ff3c92d93bea631b0ac4e600dff
Author: Thibault Saunier <tsaunier igalia com>
Date: Sat Jan 12 13:38:06 2019 -0300
WIP
.gitlab-ci.yml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb67a887..b3f2efef 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,17 @@ 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
cache:
paths:
- flatpak-cache
artifacts:
expire_in: 30 days
paths:
- - ${BUNDLE}
+ - repo/
- tests-logs/
reports:
junit:
@@ -51,7 +47,7 @@ deploy:
- PitiviBuildMachine
stage: deploy
script:
- - flatpak build-import-bundle /srv/http/ ${BUNDLE}
+ - flatpak build-commit-from --src-repo=repo /srv/http --timestamp=NOW --gpg-sign=739E841A
only:
- master@GNOME/pitivi
- 1.0@GNOME/pitivi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]