diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2018-11-09 17:30:28 +0000 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2018-11-20 15:20:17 +0000 |
| commit | a1188d294ecfac61cb883f320fe61961755bf81e (patch) | |
| tree | e430adbac27f50904670bb34ddee9b047e36209e | |
| parent | 8071c00c6fe886ac42b729f5979b2e466a84ce66 (diff) | |
| download | buildstream-a1188d294ecfac61cb883f320fe61961755bf81e.tar.gz | |
gitlab-ci.yml: Use CI_PROJECT_DIR instead of $(pwd) for cache
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5aeb495a..40946491d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,6 +56,8 @@ source_dist: stage: test variables: PYTEST_ADDOPTS: "--color=yes" + INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" + script: # Diagnostics - mount @@ -64,8 +66,6 @@ source_dist: - useradd -Um buildstream - chown -R buildstream:buildstream . - - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache" - # Unpack and get into dist/buildstream - cd dist && ./unpack.sh - chown -R buildstream:buildstream buildstream @@ -123,10 +123,9 @@ tests-unix: variables: BST_FORCE_BACKEND: "unix" PYTEST_ADDOPTS: "--color=yes" + INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" script: - - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache" - # 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 # disappear unless we mark it as user-installed. |