summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-11-11 09:58:18 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-11-11 13:47:47 +0100
commit5b6b1b10ee7ec47503a9e8f256434daf6220792a (patch)
tree70e9ca53e39db40c4dc7c1f549b953d4023faa1f
parent4c8a764b49bab346bccbcac3c411df94448ff042 (diff)
ci: fix ccache segfault during setup on CI in release-ready build
Hopefully this is the last place we need to apply this. It has been bugging the cron daily CI builds a while now. Differential Revision: https://phab.enlightenment.org/D10643 Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
-rwxr-xr-x.ci/docker-ccache-setup.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/.ci/docker-ccache-setup.sh b/.ci/docker-ccache-setup.sh
index f9c1aa7..caba08a 100755
--- a/.ci/docker-ccache-setup.sh
+++ b/.ci/docker-ccache-setup.sh
@@ -5,7 +5,8 @@ CI_BUILD_TYPE="$1"
5cp .ci/ccache.conf ~/.ccache 5cp .ci/ccache.conf ~/.ccache
6 6
7if [ "$1" = "release-ready" ] ; then 7if [ "$1" = "release-ready" ] ; then
8 ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" 8 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
9 echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf
9else 10else
10 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf 11 sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
11 echo "base_dir = $pwd" >> ~/.ccache/ccache.conf 12 echo "base_dir = $pwd" >> ~/.ccache/ccache.conf