From db4d908c06e95b0e8cac0551f40cfcffb3831349 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 5 Nov 2019 15:26:36 +0100 Subject: [PATCH] ci: work around ccache segafult during setup This is the same fix we applied for the macOS. Somehow ccache segfaults during the init. This only shows on the Ubuntu 19.10 update. Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D10599 --- .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 748e743bf9..f9c1aa7809 100755 --- a/.ci/docker-ccache-setup.sh +++ b/.ci/docker-ccache-setup.sh @@ -7,5 +7,6 @@ cp .ci/ccache.conf ~/.ccache if [ "$1" = "release-ready" ] ; then ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" else - ccache -o base_dir=$(pwd) + sed -iE '/^base_dir/d' ~/.ccache/ccache.conf + echo "base_dir = $pwd" >> ~/.ccache/ccache.conf fi