From 2f051c93b708ff01a333f560995fa32b2ffde4fb Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 4 Oct 2017 18:00:12 +0100
Subject: .gitlab-ci.yml: Use CI_PROJECT_DIR instead of $(pwd)

---
 .gitlab-ci.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 758ed436..7588d628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,12 @@
 image: buildstream/buildstream-fedora:latest
 
 variables:
+  # Store everything under the /builds directory. This is a separate Docker
+  # volume. Note that GitLab CI will only cache stuff inside the build
+  # directory.
+  XDG_CACHE_HOME: "${CI_PROJECT_DIR}/cache"
+  YBD_base: "${CI_PROJECT_DIR}/cache/ybd_base"
+  YBD_gits: "${CI_PROJECT_DIR}/cache/ybd_base/gits"
   GET_SOURCES_ATTEMPTS: 3
 
 cache:
@@ -12,14 +18,6 @@ cache:
   - cache/buildstream/sources/
 
 before_script:
-  # Store everything under the /builds directory. This is a separate Docker
-  # volume. Note that GitLab CI will only cache stuff inside the build
-  # directory.
-  - |
-    export XDG_CACHE_HOME="$(pwd)/cache"
-    export YBD_base="$(pwd)/cache/ybd_base"
-    export YBD_gits="$(pwd)/cache/ybd_base/gits"
-
   # Update to latest BuildStream
   - |
     cd ~/buildstream
-- 
cgit v1.2.1