Changes between Version 1 and Version 2 of how-to/roundcube-upgrade


Ignore:
Timestamp:
Mar 10, 2013, 6:14:15 PM (6 years ago)
Author:
Jamie McClelland
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • how-to/roundcube-upgrade

    v1 v2  
    55We have both a /srv/roundcube-dev (accessible via https://roundcube.dev.mayfirst.org) and /srv/roundcube (https://roundcube.mayfirst.org).
    66
    7 Both installations are maintained via git.
     7Both installations are maintained via git. In addition, there is a roundcube-code user that owns the code. Be sure to add your monkeysphere user id to /home/roundcube-code/.monkeysphere/authorized_user_ids and run (as root): `monkeysphere-authentication update-users roundcube-code` then login as the roundcube-code user when making all changes.
    88
    9 When upgrading, first upgrade the dev install and test, then repeat on the live install.
     9Please follow these directions when upgrading.
    1010
    11 Here's me upgrading the live installing:
    12 
     11 * Create a roundcube directory on your local machine, initialize git and set your various remotes:
    1312{{{
    14 0 stallman:/srv/roundcube# git remote update
     13mkdir roundcube
     140 jamie@animal:mfpl$ mkdir roundcube
     150 jamie@animal:mfpl$ cd roundcube/
     160 jamie@animal:roundcube$ git init
     17Initialized empty Git repository in /home/jamie/projects/mfpl/roundcube/.git/
     180 jamie@animal:roundcube$ git remote add origin https://github.com/roundcube/roundcubemail
     190 jamie@animal:roundcube$ git remote add mfpl gitosis@git.mayfirst.org:mfpl/roundcube
     200 jamie@animal:roundcube$ git remote add mfpl-live roundcube-code@stallman.mayfirst.org:/srv/roundcube
     210 jamie@animal:roundcube$ git remote add mfpl-dev roundcube-code@stallman.mayfirst.org:/srv/roundcube-dev
     220 jamie@animal:roundcube$ git remote update
    1523Fetching origin
    16 remote: Counting objects: 5011, done.
    17 remote: Compressing objects: 100% (1317/1317), done.
    18 remote: Total 4039 (delta 3072), reused 3652 (delta 2698)
    19 Receiving objects: 100% (4039/4039), 1.34 MiB | 2.53 MiB/s, done.
    20 Resolving deltas: 100% (3072/3072), completed with 336 local objects.
     24remote: Counting objects: 60301, done.
     25remote: Compressing objects: 100% (15914/15914), done.
     26remote: Total 60301 (delta 43892), reused 59892 (delta 43566)
     27Receiving objects: 100% (60301/60301), 16.07 MiB | 1.71 MiB/s, done.
     28Resolving deltas: 100% (43892/43892), done.
    2129From https://github.com/roundcube/roundcubemail
    2230 * [new branch]      dev-advanced-ldap-groups -> origin/dev-advanced-ldap-groups
    23    74cd0a9..e7c1aad  master     -> origin/master
    24    377793d..268a28e  release-0.7 -> origin/release-0.7
    25    9019025..d05808a  release-0.8 -> origin/release-0.8
     31 * [new branch]      devel-ldap-refactoring -> origin/devel-ldap-refactoring
     32 * [new branch]      keep-alive -> origin/keep-alive
     33 * [new branch]      master     -> origin/master
     34 * [new branch]      release-0.6 -> origin/release-0.6
     35 * [new branch]      release-0.7 -> origin/release-0.7
     36 * [new branch]      release-0.8 -> origin/release-0.8
    2637 * [new branch]      release-0.9 -> origin/release-0.9
    2738 * [new branch]      schema_upgrades -> origin/schema_upgrades
     39 * [new branch]      session_backport -> origin/session_backport
     40 * [new branch]      topics/composer -> origin/topics/composer
    2841From https://github.com/roundcube/roundcubemail
     42 * [new tag]         v0.1-beta2 -> v0.1-beta2
     43 * [new tag]         v0.7.3     -> v0.7.3
     44 * [new tag]         v0.8-rc    -> v0.8-rc
     45 * [new tag]         v0.8.0     -> v0.8.0
     46 * [new tag]         v0.8.1     -> v0.8.1
     47 * [new tag]         v0.8.2     -> v0.8.2
     48 * [new tag]         v0.8.3     -> v0.8.3
     49 * [new tag]         v0.8.4     -> v0.8.4
    2950 * [new tag]         v0.8.5     -> v0.8.5
    3051 * [new tag]         v0.9-beta  -> v0.9-beta
    3152 * [new tag]         v0.9-rc    -> v0.9-rc
    3253Fetching mfpl
     54remote: Counting objects: 4182, done.
     55remote: Compressing objects: 100% (1135/1135), done.
     56remote: Total 3429 (delta 2507), reused 3142 (delta 2287)
     57Receiving objects: 100% (3429/3429), 972.47 KiB | 1.47 MiB/s, done.
     58Resolving deltas: 100% (2507/2507), completed with 347 local objects.
     59From git.mayfirst.org:mfpl/roundcube
     60 * [new branch]      master     -> mfpl/master
     61 * [new branch]      mfpl       -> mfpl/mfpl
     62Fetching mfpl-live
     63remote: Counting objects: 47, done.
     64remote: Compressing objects: 100% (26/26), done.
     65remote: Total 26 (delta 15), reused 0 (delta 0)
     66Unpacking objects: 100% (26/26), done.
     67From stallman.mayfirst.org:/srv/roundcube
     68 * [new branch]      master     -> mfpl-live/master
     69 * [new branch]      mfpl       -> mfpl-live/mfpl
     70 * [new branch]      release-0.7 -> mfpl-live/release-0.7
     71 * [new branch]      release-0.8 -> mfpl-live/release-0.8
     72Fetching mfpl-dev
     73remote: Counting objects: 28, done.
     74remote: Compressing objects: 100% (20/20), done.
     75remote: Total 20 (delta 11), reused 0 (delta 0)
     76Unpacking objects: 100% (20/20), done.
     77From stallman.mayfirst.org:/srv/roundcube-dev
     78 * [new branch]      master     -> mfpl-dev/master
     79 * [new branch]      mfpl       -> mfpl-dev/mfpl
     80 * [new branch]      release-0.7 -> mfpl-dev/release-0.7
     81 * [new branch]      release-0.8 -> mfpl-dev/release-0.8
     820 jamie@animal:roundcube$
     83}}}
     84 * Now, checkout (and create a branch) for the mfpl branch of the mfpl remote (yes, confusing to have the same name for both).
     85{{{
     860 jamie@animal:roundcube$ git checkout -b mfpl mfpl/mfpl
     87Branch mfpl set up to track remote branch mfpl from mfpl.
     88Switched to a new branch 'mfpl'
     890 jamie@animal:roundcube$
     90}}}
     91 * If you run `git log` you'll see several commits made by MF/PL support team members. We want to keep these commits on top, so next we will rebase the tag we want to upgrade to:
     92{{{
    33930 stallman:/srv/roundcube#  git rebase origin/release-0.8
    3494First, rewinding head to replay your work on top of it...
     
    38980 stallman:/srv/roundcube#
    3999}}}
    40 
    41 You may need to adjust "release-0.8" depending on the version that is currently stable.
     100 * Now merge with the mfpl branch of the mfpl remote and then push:
     101{{{
     102git merge mfpl/mfpl
     103git push mfpl mfpl
     104}}}
     105 * Now, test in /srv/roundcube-dev/
     106{{{
     107git pull mfpl mfpl
     108}}}
     109 * Test via: https://roundcube.dev.mayfirst.org/
     110 * If all works fine, pull into the live server by running, in /srv/roundcube:
     111{{{
     112git pull mpl mfpl
     113}}}