From ef586986cfcccd681a70fe91b849dd827e25b371 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Wed, 21 Feb 2018 16:24:47 +0300 Subject: [PATCH 1/2] Fix cache Blocking waiting for file lock on the registry index --- scripts/gitlab-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh index 69e91569a93..3ed5d392d2f 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -48,6 +48,8 @@ set_env_win () { echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd } build () { + echo "Remove index" + rm -rf cargo/registry/index/*. echo "Build parity:" cargo build --target $PLATFORM --features final --release echo "Build evmbin:" From 1f0c0c5e9a597e70e76470bb33f6ada14769980e Mon Sep 17 00:00:00 2001 From: Kirill Pimenov Date: Thu, 1 Mar 2018 13:32:17 +0100 Subject: [PATCH 2/2] Only clean locked cargo cache on windows --- scripts/gitlab-build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh index 3ed5d392d2f..a67cca99a5c 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -48,8 +48,12 @@ set_env_win () { echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd } build () { - echo "Remove index" - rm -rf cargo/registry/index/*. + if [[ "windows" = $IDENT ]] + then + # This is a nasty hack till we figure out the proper cargo caching strategy + echo "Remove index" + rm -rf cargo/registry/index/*. + fi echo "Build parity:" cargo build --target $PLATFORM --features final --release echo "Build evmbin:"