mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-21 00:47:26 +00:00
15 lines
313 B
Bash
Executable File
15 lines
313 B
Bash
Executable File
#!/bin/bash
|
|
|
|
set -ex
|
|
source ./script/ci/includes.sh
|
|
|
|
echo "--- Verifying branch is based on current master"
|
|
exit_unless_master_merged
|
|
|
|
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
|