-
Notifications
You must be signed in to change notification settings - Fork 0
dev09 end of sprint dev staging master
Tom Purucker edited this page Jun 24, 2018
·
10 revisions
# everyone
new development should be on a feature branch
feature branches should be checked locally within the dev development before being pushed to dev
only devs/owners push to staging and master
# devs/owners
server deploys on dev, staging, master should not mix branches
server deploys should always be recursive pull (don't trust submod refs)
staging should never be ahead of dev in commits
master should only ever be 1 commit ahead of dev (the end of sprint staging -> master commit)
staging and master deploys ideally only occur at the end of a sprint
careful the status of requirements_qed when pushing to qed_py3 due to the docker build taking hash literally
get checkout dev
git pull
# sometimes you may have to use git submodule commands
# if you did not clone --recursive (but only the first time after cloning repo)
# or if the git clone --recursive was not fully successful
# or whenever a new submod is added
git submodule foreach --recursive git checkout dev
git submodule update --init --recursive
git submodule foreach --recursive git status # make sure nothing detached, etc
#everytime
git submodule foreach --recursive git checkout dev # or some other branch
#or, if you do not have the branch locally
#git submodule foreach --recursive git checkout dev origin/dev # or some other branch
git submodule foreach --recursive git fetch
git submodule foreach --recursive git pull origin dev # or some other branch
git submodule foreach --recursive git status