grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass the js-precompiled commit hash to cargo update (#2920)

Browse Source
This commit is contained in:
Jaco Greeff 2016-10-27 19:30:13 +02:00 committed by Gav Wood
parent 07fca24b44
commit a4e84c375e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/scripts/release.sh
View File

@ -28,9 +28,10 @@ git remote add origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-pr
git fetch origin 2>$GITLOG git fetch origin 2>$GITLOG
git checkout -b $CI_BUILD_REF_NAME git checkout -b $CI_BUILD_REF_NAME
git add . 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 merge origin/$CI_BUILD_REF_NAME -X ours --commit -m "$UTCDATE [release]"
git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG
PRECOMPILED_HASH=$(git rev-parse HEAD)
# back to root # back to root
popd 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 git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG
# bump js-precompiled, add, commit & push # 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 add . || true
git commit -m "[ci skip] js-precompiled $UTCDATE" git commit -m "[ci skip] js-precompiled $UTCDATE"
git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG