[pitivi/thiblahute/pre_commit_ci] x
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/thiblahute/pre_commit_ci] x
- Date: Thu, 14 Jan 2021 21:23:43 +0000 (UTC)
commit 29ad79c63bee1c081d1062ca2a39039888f8f949
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Thu Jan 14 22:23:33 2021 +0100
x
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28a345a71..7a86b1d28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ pitivi:master:
# All the downloads, build dirs, build cache, etc. are stored in /build/flatpak-cache.
- export BUILD_PITIVI="flatpak-builder --user --disable-rofiles-fuse /build/pitivi/app ${MANIFEST}
--state-dir=/build/flatpak-cache --ccache"
# Run pre-commit to download and cache the hooks.
- - export PRE_COMMIT="cd /build/pitivi && flatpak-builder --disable-rofiles-fuse
--filesystem=/build/pitivi --env=PRE_COMMIT_HOME=/build/pre-commit-home --run /build/pitivi/app ${MANIFEST}
pre-commit install-hooks"
+ - export PRE_COMMIT="cd /build/pitivi && flatpak-builder --disable-rofiles-fuse
--filesystem=/build/pitivi --env=PRE_COMMIT_HOME=/build/pre-commit-home --share=network --run
/build/pitivi/app ${MANIFEST} pre-commit install-hooks"
- env
@@ -57,13 +57,13 @@ build:
- env
- # flatpak-builder *requires* the cache dir to be on the same filesystem as the build dir.
+ # flatpak-builder *requires* the cache dir and the build dir to be on the
+ # same filesystem.
# The cache dir is in /build/flatpak-cache.
# The build dir is in /builds/GNOME/pitivi/flatpak_repo
#
- # Moving the git repo from /builds/GNOME/pitivi to /build/pitivi so that
- # it's on the same filesystem as the flatpak-builder cache in
- # /build/flatpak-cache.
+ # Moving the git repo from /builds/GNOME/pitivi to /build/pitivi so it's on
+ # the same filesystem as the flatpak-builder cache in /build/flatpak-cache.
- mv ${CI_PROJECT_DIR} /build/pitivi
- mkdir -p ${CI_PROJECT_DIR}
@@ -72,7 +72,7 @@ build:
- ${RUN_IN_SANDBOX} meson mesonbuild/
- ${RUN_IN_SANDBOX} ninja -C mesonbuild/
- ${RUN_IN_SANDBOX} pre-commit run --all-files
- - 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
+ - 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
cache:
paths:
- flatpak-cache
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]