[pitivi/sdk] x
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/sdk] x
- Date: Mon, 7 Dec 2020 23:23:29 +0000 (UTC)
commit 750a6ccffc93e187772507c40fce35c21d9ed3b5
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Dec 8 00:23:20 2020 +0100
x
.gitlab-ci.yml | 4 ++++
runner | 9 ++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e52cf5827..d470d3628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,10 @@ build:
- export FLATPAK_REPO="${CI_PROJECT_DIR}/flatpak_repo"
- env
+ - whoami
+ - pwd
+ - ls -al
+ - ls -al /root
# Working around the fact that flatpak-builder *requires* the cache dir
# to be on the same filesystem as the build dir
diff --git a/runner b/runner
index 7374508d0..00d24ce75 100644
--- a/runner
+++ b/runner
@@ -3,10 +3,13 @@ FROM registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.38
# This is just a temporary directory. It will be deleted at the end.
ENV DIR=/root/pitivi.git
-RUN git clone ${CI_PROJECT_URL}.git ${DIR} --single-branch -b ${CI_COMMIT_REF_NAME}
+RUN git clone ${CI_PROJECT_URL}.git --single-branch ${DIR} -b ${CI_COMMIT_REF_NAME}
-# Create the flatpak sandbox
-RUN flatpak-builder --user --disable-rofiles-fuse ${DIR}/app ${DIR}/build/flatpak/org.pitivi.Pitivi.json
--state-dir=${FLATPAK_BUILDER_CACHE} --ccache
+# Populate the flatpak cache by creating the sandbox.
+RUN flatpak-builder --user --disable-rofiles-fuse \
+ ${DIR}/app ${DIR}/build/flatpak/org.pitivi.Pitivi.json \
+ --state-dir=${FLATPAK_BUILDER_CACHE} \
+ --ccache
# We're only interested in the flatpak cache being populated.
RUN rm -rf ${DIR}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]