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

Add existing release files before merge (#3747)

Browse Source
This commit is contained in:
Jaco Greeff 2016-12-08 15:20:53 +01:00 committed by GitHub
parent 5d224df2d5
commit fb80cf6190
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/scripts/release.sh
View File

@ -35,13 +35,15 @@ git checkout -b $BRANCH
echo "*** Committing compiled files for $UTCDATE" echo "*** Committing compiled files for $UTCDATE"
mv build ../build.new mv build ../build.new
git add .
git commit -m "$UTCDATE [update]"
git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
git rm build/* git rm build/*
git commit -m "$UTCDATE [cleanup]" git commit -m "$UTCDATE [cleanup]"
mv -f ../build.new/* build/ mv -f ../build.new/* build/
rm -rf ../build.new rm -rf ../build.new
git add . git add .
git commit -m "$UTCDATE [update]" git commit -m "$UTCDATE [release]"
echo "*** Merging remote" echo "*** Merging remote"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG

2
js/scripts/test.js
View File

@ -1 +1 @@
// test script 2 // test script 3