Commit 26b02b43 authored by Tristan Maat's avatar Tristan Maat

Move cache location

parent 5109d1e5
Pipeline #12716428 passed with stage
in 11 minutes and 39 seconds
......@@ -2,12 +2,12 @@ image: buildstream/buildstream-fedora:latest
cache:
paths:
- cache/buildstream/sources/
- buildstream-tests/tmp/sources
before_script:
# Store cache in the project directory
- mkdir -p "$(pwd)/cache"
- export XDG_CACHE_HOME="$(pwd)/cache"
# Work around https://github.com/fedora-cloud/docker-brew-fedora/issues/14
- export LANG="C.UTF-8"
- export LC_ALL="C.UTF-8"
# Add up-to-date bst
- git clone 'https://gitlab.com/BuildStream/buildstream.git'
......
......@@ -106,9 +106,10 @@ bst_with_flags() {
if [ ! -z "${BST_COVERAGE}" ]; then
coverage run --parallel-mode \
--rcfile=${BST_COVERAGE} \
-c "${CONFIG_LOCATION}"
$(which bst) ${BST_FLAGS:-} "$@"
else
bst ${BST_FLAGS:-} "$@"
bst -c "${CONFIG_LOCATION}" ${BST_FLAGS:-} "$@"
fi
}
......
......@@ -13,7 +13,7 @@ arches:
url: gnomesdk:repo/
track: runtime/org.freedesktop.BasePlatform/x86_64/1.6
gpg-key: keys/gnome-sdk.gpg
ref: 1f50da6928cf70a36cd4e71060fcc34a5c95977b8e4c5d904f5b2f053235ea26
ref: 9a2d4d9b4a2cf4e1ddcfd1b696e5cefba35d62b70ef61435b15ea3cb905cc4cf
i386:
sources:
- kind: ostree
......
......@@ -10,7 +10,7 @@ arches:
url: gnomesdk:repo/
track: runtime/org.freedesktop.BaseSdk/x86_64/1.6
gpg-key: keys/gnome-sdk.gpg
ref: c86ca2adfe42e1c5d1583f738e569c9aad467990fd4b1e30e516b579383b46f3
ref: fa0dbd1b1eee9ec89518c1938c89803e0c54a12cd7ce892082433ad56b8a6f9b
i386:
sources:
- kind: ostree
......
......@@ -37,6 +37,16 @@ main () {
export BST_COVERAGE
export BST_FLAGS
# Create buildstream.conf
cat > "$(pwd)/buildstream.conf" <<EOF
sourcedir: "$(pwd)/tmp/sources"
builddir: "$(pwd)/tmp/build"
artifactdir: "$(pwd)/tmp/artifacts"
logdir: "$(pwd)/tmp/logs"
EOF
CONFIG_LOCATION="$(pwd)/buildstream.conf"
export CONFIG_LOCATION
while : ;
do
case "${1:-}" in
......@@ -98,7 +108,7 @@ run () {
for dir in $tests;
do
if [ -d "$dir" ]
if [ -d "$dir" ] && [ "$dir" != "tmp" ]
then
run-test "$dir"
state=$?
......@@ -147,7 +157,9 @@ clean () {
if [ -d "$dir" ]
then
(cd "$dir" || exit 1
rm -rf "results/"*)
rm -rf "results/"*
rm -rf ".bst/"
rm -rf "$(pwd)/tmp/")
fi
done
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment