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

Output git fetch/push to log files (#2862)

Browse Source 
* add -q options for fetch & push

* Store log in .gitignored location

* update GITLOG command location

* Remove test branch
This commit is contained in:
Jaco Greeff 2016-10-25 17:39:19 +02:00 committed by Gav Wood
parent 03e2aa61e2
commit e71c752210
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/scripts/release.sh
View File

@ -10,7 +10,9 @@ function setup_git_user {
} }
# change into the build directory # change into the build directory
pushd `dirname $0` BASEDIR=`dirname $0`
GITLOG=./.git/gitcommand.log
pushd $BASEDIR
cd ../.build cd ../.build
# variables # variables
@ -33,12 +35,12 @@ git init
# add local files and send it up # add local files and send it up
setup_git_user setup_git_user
git remote add origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-precompiled.git git remote add origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-precompiled.git
git fetch origin 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 [compiled]"
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 $CI_BUILD_REF_NAME git push origin $CI_BUILD_REF_NAME 2>$GITLOG
# back to root # back to root
popd popd
@ -49,10 +51,10 @@ cargo update -p parity-ui-precompiled
# add to git and push # add to git and push
setup_git_user 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 fetch origin git fetch origin 2>$GITLOG
git add . || true git add . || true
git commit -m "[ci skip] js-precompiled $UTCDATE" || true git commit -m "[ci skip] js-precompiled $UTCDATE" || true
git push origin || true git push origin $CI_BUILD_REF_NAME 2>$GITLOG || true
# exit with exit code # exit with exit code
exit 0 exit 0