Changes between Version 6 and Version 7 of CodeManagementReleaseProcess

Timestamp:

11/25/11 18:59:23 (5 years ago)

Author:

jim

Comment:

--

CodeManagementReleaseProcess

@@ -36 +36 @@
 Where [branch] is the branch you want to work with... Branches available on GitHub are: {{{development}}}, {{{live}}}. Use {{{development}}} for all normal work as this branch is available on the DEV server. Use {{{live}}} only for making small, incremental updates based on the code in LIVE -- but avoid this approach unless absolutely necessary.
 
-Once you have this, you will be able to edit files on your machine and then later commit them back to the repository - once TESTED of course! '''Note''' that the above checkout DOES NOT contain the Drupal settings.php files, nor any files uploaded to the server. It will contain the site's theme though: you will need to get or create these as needed for your setup and configuration.
+Once you have this, you will be able to edit files on your machine and then later commit them back to the repository - once TESTED of course! '''Note''' that the above checkout includes a .gitignore files that means the repository DOES NOT contain the Drupal settings.php files, nor any files uploaded to the server, nor any other unnecessary files your computer might add. It will contain the site's theme though: you will need to get or create these as needed for your setup and configuration.
 
 
@@ -89 +89 @@
 This step is critical because the DEV server mirrors the setup on LIVE. Hence any issues or differences you didn't spot whilst working on your local machine can be ironed out here. It also allows you to get feedback on your work so far as required.
 
-'''Note:''' To get files onto the server, you must have logged into the development server via SSH - for more on how to do this see wiki:DevelopmentServer#SSHaccess.
+'''Note:''' To get files onto the server, you must have logged into the development server via SSH - for more on how to do this see wiki:DevelopmentServer#SSHaccess. '''ALSO NOTE''' the DEV and LIVE servers require the use of {{{sudo}}} to make changes. This means that the Root user on both DEV (Kiwi) and LIVE (Quince) have been given access to the Github account.
 {{{
 ssh dev.transitionnetwork.org.webarch.net
 cd /web/dev.transitionnetwork.org.webarch.net/www
-git fetch origin  <--- 'origin' is github in this case
+sudo git pull  <--- 'origin' is github in this case
 }}}
-The last command gets all the updates to all branches  the DEV site up to the latest Trunk version. Go to http://dev.transitionnetwork.org.webarch.net/ and enjoy the fruits of your labour.
+The last command gets all the updates to the current branch ('development' is the only one on DEV) and merges them into the current working directory. Go to http://dev.transitionnetwork.org.webarch.net/ and enjoy the fruits of your labour. You might need to run 'update.php', too.
 
 Depending on the changes, you should test properly and then solicit feedback and testing from managers/stakeholders. This is probably on DEV, but could be on TEST if needed.
 
 
-=== 5. Release to LIVE (or TEST) ===
-Please note the documentation for the LIVE server is here: wiki:NewLiveServer - and you should have decided whether or not it's necessary to do a run of testing on the TEST site before moving to LIVE... The process for both is the same, just on different machines.
+=== 5. Merge 'development' into 'live', pull onto LIVE server ===
+Please note the documentation for the LIVE server is here: wiki:NewLiveServer - and you should have decided whether or not it's necessary to do a run of testing on the TEST site before moving to LIVE... TEST is not presently set up with a Git repository, but the process for both would be the same. Contact Jim if TEST is actually needed.
 
-'''4a. Prepare for release''' by...
+'''4a. Merge your branches''' by...
+ON YOUR MACHINE:
+{{{
+git checkout [the branch you want to merge into] <--- probably 'live' at this stage]
+git pull <--- belt and braces to make sure you've not forgotten to merge something
+git merge [your working branch] <--- probably 'development'
+}}}
+The above will merge your recent work in [your working branch] into [the branch you want to merge into 'live']. This is probably a case of checking out 'live' and merging 'development' at this point. If all ok, follow rest of "3. Merge your code and push back to Github" but pushing the 'live' branch.
+
+'''4b. Prepare LIVE'''
  1. SSH into LIVE (or TEST): ssh www.transitionnetwork.org (OR for TEST: ssh test.transitionnetwork.org.webarch.net)
  1. Go to the site root folder {{{ cd /web/transitionnetwork.org/www }}} (OR cd /web/test.transitionnetwork.org.webarch.net/www)