Skip to content
Snippets Groups Projects
Commit f3f11320 authored by Benjamin Schubert's avatar Benjamin Schubert
Browse files

gitlab-ci.yml: Use CI_PROJECT_DIR instead of $(pwd) for cache

parent e6e03451
Branches
Tags
Loading
...@@ -56,6 +56,8 @@ source_dist: ...@@ -56,6 +56,8 @@ source_dist:
stage: test stage: test
variables: variables:
PYTEST_ADDOPTS: "--color=yes" PYTEST_ADDOPTS: "--color=yes"
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
script: script:
# Diagnostics # Diagnostics
- mount - mount
...@@ -64,8 +66,6 @@ source_dist: ...@@ -64,8 +66,6 @@ source_dist:
- useradd -Um buildstream - useradd -Um buildstream
- chown -R buildstream:buildstream . - chown -R buildstream:buildstream .
- export INTEGRATION_CACHE="$(pwd)/cache/integration-cache"
# Unpack and get into dist/buildstream # Unpack and get into dist/buildstream
- cd dist && ./unpack.sh - cd dist && ./unpack.sh
- chown -R buildstream:buildstream buildstream - chown -R buildstream:buildstream buildstream
...@@ -109,10 +109,9 @@ tests-unix: ...@@ -109,10 +109,9 @@ tests-unix:
variables: variables:
BST_FORCE_BACKEND: "unix" BST_FORCE_BACKEND: "unix"
PYTEST_ADDOPTS: "--color=yes" PYTEST_ADDOPTS: "--color=yes"
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
script: script:
- export INTEGRATION_CACHE="$(pwd)/cache/integration-cache"
# We remove the Bubblewrap and OSTree packages here so that we catch any # We remove the Bubblewrap and OSTree packages here so that we catch any
# codepaths that try to use them. Removing OSTree causes fuse-libs to # codepaths that try to use them. Removing OSTree causes fuse-libs to
# disappear unless we mark it as user-installed. # disappear unless we mark it as user-installed.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment