[citemplates/abderrahim/cache] move flatpak-builder state directory outside of the repo
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [citemplates/abderrahim/cache] move flatpak-builder state directory outside of the repo
- Date: Sun, 31 May 2020 19:55:24 +0000 (UTC)
commit 6309b9baf00e0441dbbaa578ed67e1abc6f8608f
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Sun May 31 20:55:02 2020 +0100
move flatpak-builder state directory outside of the repo
if we keep it inside the repo, gitlab will delete it before building
flatpak/flatpak_ci_initiative.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/flatpak/flatpak_ci_initiative.yml b/flatpak/flatpak_ci_initiative.yml
index e97e1f7..d26d9ae 100644
--- a/flatpak/flatpak_ci_initiative.yml
+++ b/flatpak/flatpak_ci_initiative.yml
@@ -4,10 +4,11 @@
interruptible: true
tags:
- flatpak
+ variables:
+ FLATPAK_BUILDER: flatpak-builder --user --disable-rofiles-fuse --state-dir=$HOME/.flatpak-builder
script:
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE}
- - flatpak-builder --user --disable-rofiles-fuse flatpak_app --repo=repo
${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
-
+ - ${FLATPAK_BUILDER} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
# Generate a Flatpak bundle
- flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
- tar cf repo.tar repo/
@@ -15,11 +16,11 @@
# Run automatic tests inside the Flatpak env
# we need to recreate the build directory because cleanup would have deleted build dependencies
- rm -rf flatpak_app
- - flatpak-builder --user --disable-rofiles-fuse --build-only flatpak_app ${MANIFEST_PATH}
+ - ${FLATPAK_BUILDER} --build-only flatpak_app ${MANIFEST_PATH}
- flatpak build-finish --socket=x11 --share=network flatpak_app
- >
xvfb-run -a -s "-screen 0 1024x768x24"
- flatpak-builder --user --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app
${MANIFEST_PATH} <<END
+ ${FLATPAK_BUILDER} --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH} <<END
LANG=C.UTF-8
NO_AT_BRIDGE=1
@@ -35,14 +36,14 @@
paths:
- "${BUNDLE}"
- 'repo.tar'
- - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
- - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
+ - '$HOME/.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
+ - '$HOME/.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
expire_in: 14 days
cache:
key: "$CI_JOB_NAME"
paths:
- - '.flatpak-builder/downloads'
- - '.flatpak-builder/git'
+ - '$HOME/.flatpak-builder/downloads'
+ - '$HOME/.flatpak-builder/git'
.review:
stage: 'deploy'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]