From a4e84c375e05f5dbef26b730094fd653a61803ca Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 27 Oct 2016 19:30:13 +0200 Subject: [PATCH] Pass the js-precompiled commit hash to cargo update (#2920) --- js/scripts/release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index 392bdd3b8..8e90713cb 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -28,9 +28,10 @@ git remote add origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-pr git fetch origin 2>$GITLOG git checkout -b $CI_BUILD_REF_NAME git add . -git commit -m "$UTCDATE [compiled]" +git commit -m "$UTCDATE" git merge origin/$CI_BUILD_REF_NAME -X ours --commit -m "$UTCDATE [release]" git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG +PRECOMPILED_HASH=$(git rev-parse HEAD) # back to root popd @@ -43,7 +44,7 @@ git remote set-url origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/p git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG # bump js-precompiled, add, commit & push -cargo update -p parity-ui-precompiled +cargo update -p parity-ui-precompiled --precise $PRECOMPILED_HASH git add . || true git commit -m "[ci skip] js-precompiled $UTCDATE" git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG