Skip to content

Commit

Permalink
Update CI to merge back to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
beshur committed Sep 26, 2018
1 parent 3e84b31 commit ec2bfbd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis/push.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh

echo "Merging ${TRAVIS_BRANCH} to master"
echo "Merging ${TRAVIS_BRANCH} to develop"
git config --global user.email "[email protected]"
git config --global user.name "Travis CI"
git config --global push.default current
# need to do it, bc Travis checks out a commit by hash
git fetch && git checkout master && git merge ${TRAVIS_BRANCH} --no-edit
git fetch && git checkout develop && git merge ${TRAVIS_BRANCH} --no-edit
git push https://${GH_TOKEN}@github.com/stoplay/stoplay-ext.git

0 comments on commit ec2bfbd

Please sign in to comment.