commit 305b4976319b9a0e9ee894ecb8155893d559223f
Author: Thibault Saunier <tsaunier igalia com>
Date: Sat Jan 5 12:04:39 2019 +0100
WIP
.gitlab-ci.yml | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eada190d..f2eae6b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
BUNDLE: "pitivi.flatpak"
MANIFEST: build/flatpak/org.pitivi.Pitivi.json
DBUS_ID: org.pitivi.Pitivi
+ XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
build:
image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.30
@@ -16,7 +17,6 @@ build:
- xunit.xml
script:
- export BUILDDIR=${HOME}/pitivi
- - export XUNIT_PATH=${CI_PROJECT_DIR}/xunit.xml
- export MANIFEST=${BUILDDIR}/build/flatpak/org.pitivi.Pitivi.json
- export RUN_IN_SANDBOX="flatpak-builder --filesystem=${BUILDDIR} --filesystem=${CI_PROJECT_DIR}
--env=PITIVI_DEVELOPMENT=1 --run app ${MANIFEST}"
@@ -37,9 +37,12 @@ build:
paths:
- flatpak-cache
artifacts:
+ expire_in: 30 days
paths:
- ${BUNDLE}
- expire_in: 30 days
+ reports:
+ junit:
+ - ${XUNIT_PATH}
deploy:
tags:
@@ -48,29 +51,23 @@ deploy:
script:
- flatpak build-import-bundle repo ${BUNDLE}
+# Not using a Dockerfile because we need the container to be privileged to run flatpak inside of it
+# and it is not possible to use a privileged `docker build`.
.build_emplate: &build_docker_image
image: docker:latest
services:
- docker:dind
script:
- # For debugging
- - echo ${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}-sdk_3.30"
- - echo ${TMPIMAGENAME}
-
- # Not using a Dockerfile because we need the container to be privileged to run flatpak inside of it
- # and it is not possible to use a privileged `docker build`.
- export RUN_IN_SANDBOX="flatpak-builder --filesystem=${BUILDDIR} --filesystem=${CI_PROJECT_DIR}
--env=PITIVI_DEVELOPMENT=1 --run app ${MANIFEST}"
-
- export BUILDDIR="\${HOME}/pitivi"
- export CLONE_PITIVI="git clone ${CI_PROJECT_URL}.git --single-branch \${HOME}/pitivi -b
${CI_COMMIT_REF_NAME}"
-
- export BUILD_PITIVI="flatpak-builder ${BUILDDIR}/app
${BUILDDIR}/build/flatpak/org.pitivi.Pitivi.json --state-dir=\${HOME}/flatpak-cache --ccache"
+ - env
+
- docker run --privileged --name ${TMPIMAGENAME} ${BASE_IMAGE} bash -c "${CLONE_PITIVI} &&
${BUILD_PITIVI} && rm -Rf ${BUILDDIR}"
- docker commit ${TMPIMAGENAME} ${IMAGE}
- docker rm ${TMPIMAGENAME}