-
Notifications
You must be signed in to change notification settings - Fork 10
Deploying to Acquia Cloud
Assuming this naming of remotes:
-
upstream
git@github.com:Drupal4Gov/Drupal-GovCon-2016.git
-
origin (your fork)
git@github.com:[username]/Drupal-GovCon-2016.git
-
acquia
capitalcamp@svn-6971.prod.hosting.acquia.com:capitalcamp.git
-
Test PR code locally, make sure to test database updates and feature reversion
-
Merge all PR code for release into develop branch on github
-
Update local develop branch by pulling from upstream (Drupal4Gov repo)
-
Push local develop to Acquia develop repo and test in cloud environment against a refreshed database
-
When satisfied that nothing will break
-
Check out local master branch, make sure it's up to date with current upstream (Drupal4Gov repo)
-
Merge develop into master
git merge --no-ff develop
-
Create a tag on the master branch that references the develop branch
git tag -a [ver] -m [log message]
for example:
git tag -a 2016-03-13 -m "Add speaker bio to splash page"
- Push changes and tag to github, and then to the acquia repo
git push upstream master
git push upstream --tags
git push acquia master
git push acquia --tags