raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into single-order-patches

Browse Source
This commit is contained in:
Rohan Mitchell
2015-05-06 18:13:55 +10:00
parent 7b4130972b 485eee4bdd
commit 0921cd2dfa
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
script/ci/merge_branch_to_master.sh
View File

@@ -7,4 +7,4 @@ echo "--- Verifying branch is based on current master"
exit_unless_master_merged
echo "--- Pushing branch"
echo git push origin $BUILDKITE_COMMIT:master
git push origin $BUILDKITE_COMMIT:master

4
script/ci/push_to_production.sh
View File

@@ -12,4 +12,6 @@ echo "--- Saving baseline data for staging"
ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/ci/save_staging_baseline.sh $BUILDKITE_COMMIT"
echo "--- Pushing to production"
[[ $(git push production $BUILDKITE_COMMIT:master --force 2>&1) =~ "Done" ]]
output=$(git push production $BUILDKITE_COMMIT:master --force 2>&1)
echo $output
[[ $output =~ "Done" ]]

4
script/ci/push_to_staging.sh
View File

@@ -16,4 +16,6 @@ echo "--- Loading baseline data"
ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/ci/load_staging_baseline.sh"
echo "--- Pushing to staging"
[[ $(git push staging2 $BUILDKITE_COMMIT:master --force 2>&1) =~ "Done" ]]
output=$(git push staging2 $BUILDKITE_COMMIT:master --force 2>&1)
echo $output
[[ $output =~ "Done" ]]