[tor-commits] [tor-browser-spec/master] Try to avoid bad version info and 404s.

[mikeperry at torproject.org]

commit 3b9f0cb149da1a3567790d86dd0a9f652c19ff5e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Jan 13 22:11:51 2015 -0800

    Try to avoid bad version info and 404s.
    
    Make it clear that we need to update the version info right after putting up
    binaries, and that we should do it in two stages.
---
 processes/ReleaseProcess |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index b1c2258..ebaebc7 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -81,19 +81,22 @@
    chmod 664 $TORBROWSER_VERSION/*
    static-update-component dist.torproject.org
 
-#. Update website's torbrowser versions file
+#. Update website's torbrowser versions file in the website git
+#  NOTE: This *must* be done immediately after the previous step!
    cd webwml
    torsocks git pull origin
+   # In the RecommendedTBBVersions file, only add the new version. Don't
+   # remove the old one yet. That comes later.
    vim ./include/versions.wmi ./projects/torbrowser/RecommendedTBBVersions
-   git commit include/versions.wmi projects/torbrowser/RecommendedTBBVersions -m "Bump TBB version"
+   git commit include/versions.wmi projects/torbrowser/RecommendedTBBVersions -m "Add new TBB version"
    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.
+   # 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.
 
 #. Update and upload new update responses for the updater
    cd tor-browser-bundle/gitian
@@ -105,3 +108,12 @@
    torsocks rsync -av htdocs/$TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/
    torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org"
 
+#. Update website's torbrowser versions file to remove old versions
+   cd webwml
+   torsocks git pull origin
+   # Now it's time to remove the obsolete version(s)
+   vim ./projects/torbrowser/RecommendedTBBVersions
+   git commit projects/torbrowser/RecommendedTBBVersions -m "Deprecate old TBB version"
+   torsocks git push origin master:master
+   cd ..
+