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

Release script back to using fetch/merge (#3746)

Browse Source 
* Update with -X only for merge

* Release back to using fetch/merge
This commit is contained in:
Jaco Greeff 2016-12-08 15:02:45 +01:00 committed by GitHub
parent cbd5fe7c07
commit 5d224df2d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/scripts/release.sh
View File

@ -35,13 +35,13 @@ 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 pull origin/$BRANCH --commit --no-edit -X ours git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
git rm build/* git rm build/*
git commit -m "$UTCDATE [rm old]" 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" git commit -m "$UTCDATE [update]"
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 // test script 2