Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

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

Merged
merged 1 commit into from
Oct 27, 2016
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions js/scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down