From a9e7f592034038c6ca71837faa37f89d3e36098c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 27 Oct 2016 21:15:41 +0200 Subject: [PATCH] Merge branch 'master' into jg-js-release-fix (#2924) # Conflicts: # js/scripts/release.sh --- js/scripts/release.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index c08d92ca0..4f5bf421d 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -40,8 +40,6 @@ 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) -echo "Remote updated with [$PRECOMPILED_HASH]" - # back to root popd @@ -50,11 +48,11 @@ setup_git_user git remote set-url origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/parity.git git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG -echo "Updating cargo package parity-ui-precompiled" -cargo update -p parity-ui-precompiled --precise $PRECOMPILED_HASH +echo "Updating cargo package parity-ui-precompiled#$PRECOMPILED_HASH" +cargo update -p parity-ui-precompiled --precise "$PRECOMPILED_HASH" echo "Committing updated files" -git add . || true +git add . git commit -m "[ci skip] js-precompiled $UTCDATE" git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG