Changes between Version 8 and Version 9 of CodeManagementReleaseProcess


Ignore:
Timestamp:
11/26/11 14:01:06 (5 years ago)
Author:
jim
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CodeManagementReleaseProcess

    v8 v9  
    3737 
    3838Once 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. 
     39 
     40'''NOTE''' LIVE and DEV servers have had {{{git config core.filemode false}}} set to avoid Git setting the file permissions. You will want to run this command in your copy of the repo on your machine, especially if you're running your own webserver. 
    3941 
    4042 
     
    106108'''ON YOUR MACHINE:''' 
    107109{{{ 
    108 git checkout [the branch you want to merge into] <--- probably 'live' at this stage] 
     110git checkout [the branch you want to merge into] <--- probably 'live' at this stage 
    109111git pull <--- belt and braces to make sure you've not forgotten to merge something 
    110112git merge [your working branch] <--- probably 'development' 
     
    126128'''5d. Deploy the new code''': Back in the terminal where you are SSHed into the correct machine AND in the correct site root folder... 
    127129{{{ 
    128 sudo -i 
    129130sudo git pull 
    130131}}} 
     
    138139 1. Let everyone who needs to know the site is back and updated. Then have a beer. 
    139140 
    140 === 5. Rolling back a release === 
     141=== 6. Rolling back a release === 
    141142If it goes badly, don't panic. You have all the old code in Git and a snapshot of the database just prior to updating it. To roll back, run the following commands on the server you're logged into: 
    142143 1. (Assuming you can still use Drupal) Take the site back offline and go to 'Site building' -> 'Backup & migrate' -> 'Restore' (if the NewLiveServer#mysql-backup script has been used then the restore will have to be done via the command line). 
     
    151152Once the database is back, WITHOUT doing anything more in Drupal, switch the files back: 
    152153{{{ 
    153   sudo -i 
    154   svn switch https://tech.transitionnetwork.org/svn/www/release/[the previous release]/ . 
     154  PROCESS TO BE LOOKED UP AND DOCUMENTED! (sorry!) 
    155155}}} 
    156156That's the files back so clear the caches and test the site.