raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-20 04:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into optimise-shopfront

Browse Source
This commit is contained in:
Rohan Mitchell
2015-06-03 13:02:58 +10:00
parent 36dc0d5ccd 473322c7e6
commit 769a04d2e0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/ci/merge_branch_to_master.sh
View File

@@ -6,5 +6,9 @@ source ./script/ci/includes.sh
echo "--- Verifying branch is based on current master"
exit_unless_master_merged
echo "--- Pushing branch"
git push origin $BUILDKITE_COMMIT:master
echo "--- Merging and pushing branch"
git checkout master
git merge origin/master
git merge origin/$BUILDKITE_BRANCH
git push origin master
git checkout origin/$BUILDKITE_BRANCH