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

Merge branch 'master' into jg-js-release-fix (#2924)

Browse Source 
# Conflicts:
#	js/scripts/release.sh
This commit is contained in:
Jaco Greeff 2016-10-27 21:15:41 +02:00 committed by GitHub
parent 9fd8ac6a15
commit a9e7f59203
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/scripts/release.sh
View File

@ -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 git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG
PRECOMPILED_HASH=$(git rev-parse HEAD) PRECOMPILED_HASH=$(git rev-parse HEAD)
echo "Remote updated with [$PRECOMPILED_HASH]"
# back to root # back to root
popd popd
@ -50,11 +48,11 @@ setup_git_user
git remote set-url origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/parity.git git remote set-url origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/parity.git
git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG
echo "Updating cargo package parity-ui-precompiled" echo "Updating cargo package parity-ui-precompiled#$PRECOMPILED_HASH"
cargo update -p parity-ui-precompiled --precise $PRECOMPILED_HASH cargo update -p parity-ui-precompiled --precise "$PRECOMPILED_HASH"
echo "Committing updated files" echo "Committing updated files"
git add . || true git add .
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