[tor-commits] [tor-browser-spec/master] Separate the recommended versions update into two steps.

[mikeperry at torproject.org]

commit 67c6be5cd7aae458bbfc0edd82073d437c523f53
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Jul 25 17:16:45 2014 -0700

    Separate the recommended versions update into two steps.
    
    First add the new one, then remove the old one.
---
 processes/ReleaseProcess |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index ea1929e..a2a7a44 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -64,6 +64,16 @@
    cp -a $TORBROWSER_VERSION /srv/www-master.torproject.org/htdocs/dist/torbrowser/
    /home/mirroradm/bin/trigger-mirrors
 
+#. Add $TORBROWSER_VERSION to recommended-versions file in torbrowser.git
+#  (Don't remove old version yet)
+   cd torbrowser
+   git checkout master
+   torsocks git pull origin
+   vim ./build-scripts/recommended-versions
+   git commit build-scripts/recommended-versions
+   torsocks git push origin master:master
+   cd ..
+
 #. Update website's torbrowser versions file
    cd website
    torsocks svn up .
@@ -72,21 +82,19 @@
    ./publish
    cd ..
 
-#. Update recommended-versions file in torbrowser.git
+#. Create blog post from changelog
+#  XXX: Template?
+#  See https://blog.torproject.org/blog/tor-browser-352-released for now
+#  Don't forget to link to Mozilla's security advisories if this is a security
+#  update, or Nadim will yell at you.
+
+#. Remove old version from recommended-versions file in torbrowser.git
    cd torbrowser
-   git checkout maint-2.4
+   git checkout master
    torsocks git pull origin
    vim ./build-scripts/recommended-versions
    git commit build-scripts/recommended-versions
-   git checkout master
-   torsocks git pull origin
-   git merge maint-2.4
-   torsocks git push origin maint-2.4:maint-2.4
    torsocks git push origin master:master
    cd ..
 
-#. Create blog post from changelog
-#  XXX: Template?
-#  See https://blog.torproject.org/blog/tor-browser-352-released for now
-#  Don't forget to link to Mozilla's security advisories if this is a security
-#  update, or Nadim will yell at you.
+