From 5b6b1b10ee7ec47503a9e8f256434daf6220792a Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 11 Nov 2019 09:58:18 +0100 Subject: [PATCH] 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 --- .ci/docker-ccache-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/docker-ccache-setup.sh b/.ci/docker-ccache-setup.sh index f9c1aa7809..caba08ac81 100755 --- a/.ci/docker-ccache-setup.sh +++ b/.ci/docker-ccache-setup.sh @@ -5,7 +5,8 @@ CI_BUILD_TYPE="$1" cp .ci/ccache.conf ~/.ccache if [ "$1" = "release-ready" ] ; then - ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" + sed -iE '/^base_dir/d' ~/.ccache/ccache.conf + echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf else sed -iE '/^base_dir/d' ~/.ccache/ccache.conf echo "base_dir = $pwd" >> ~/.ccache/ccache.conf