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

Output git fetch/push to log files #2862

Merged
merged 4 commits into from
Oct 25, 2016
Merged

Output git fetch/push to log files #2862

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
312e987
add -q options for fetch & push
jacogr Oct 25, 2016
b134b76
Store log in .gitignored location
jacogr Oct 25, 2016
37c6344
update GITLOG command location
jacogr Oct 25, 2016
779e38a
Remove test branch
jacogr Oct 25, 2016
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
12 changes: 7 additions & 5 deletions js/scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ function setup_git_user {
}

# change into the build directory
pushd `dirname $0`
BASEDIR=`dirname $0`
GITLOG=./.git/gitcommand.log
pushd $BASEDIR
cd ../.build

# variables
Expand All @@ -33,12 +35,12 @@ git init
# add local files and send it up
setup_git_user
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 add .
git commit -m "$UTCDATE [compiled]"
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
popd
Expand All @@ -49,10 +51,10 @@ cargo update -p parity-ui-precompiled
# add to git and push
setup_git_user
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 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 0