You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2014/02/11 17:46:56 UTC

svn commit: r1567213 - in /spamassassin/trunk/build: README update_website_docs

Author: kmcgrail
Date: Tue Feb 11 16:46:56 2014
New Revision: 1567213

URL: http://svn.apache.org/r1567213
Log:
Working on auto build of website docs

Modified:
    spamassassin/trunk/build/README
    spamassassin/trunk/build/update_website_docs

Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?rev=1567213&r1=1567212&r2=1567213&view=diff
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Tue Feb 11 16:46:56 2014
@@ -114,7 +114,8 @@ SPAMASSASSIN RELEASE PROCEDURE
     just after the 3.1.0 branch was created; r46030 was the start of the
     3.1.0 work (created 3.0 branch); replace with the correct rev number
     for the point you want to start at if different. I used r1149751 to
-    produce the first 3.4.0-pre release, for example.
+    produce the first 3.4.0-pre release, for example.  r1567124 is the
+    3.4.0 release tag revision.
 
 - Exclude some automated changes from the logs
 
@@ -179,7 +180,12 @@ SPAMASSASSIN RELEASE PROCEDURE
 
   - For a trunk release (x.y.0):
 
-    vers=3_0_0
+    vers=3_4_0
+
+    repo=https://svn.apache.org/repos/asf/spamassassin
+    svn delete -m "replaced old tag" $repo/tags/spamassassin_release_$vers
+    svn copy -m "creating tag for release $vers" \
+        $repo/trunk $repo/tags/spamassassin_release_$vers
 
   - For a trunk release candidate (x.y.0-rc1), pre-release (x.y.0-preZ) or alpha (x.y.0-alphaZ):
 
@@ -279,7 +285,7 @@ SPAMASSASSIN RELEASE PROCEDURE
 
   http://www.cpan.org/modules/04pause.html#developerreleases
 
-  As of 2014-02-05, adding TRIAL to the filename should work
+  As of 2014-02-05, adding TRIAL to the filename should work.
 
 - (for a full release) 3 +1's votes from PMC members are required to 
   proceed with an official (not pre-release) ASF software release.
@@ -299,8 +305,7 @@ SPAMASSASSIN RELEASE PROCEDURE
   branch, off the trunk.
 
     repo=https://svn.apache.org/repos/asf/spamassassin
-    svn copy $repo/tags/spamassassin_release_3_4_0 \
-           $repo/branches/3.4
+    svn copy $repo/tags/spamassassin_release_3_4_0 $repo/branches/3.4 -m 'Creating 3.4 branch'
 
   "trunk" is SVN's concept of head.  Typically, our branches are named
   for their minor version number.  In the example above, 3.4 is the
@@ -320,6 +325,8 @@ SPAMASSASSIN RELEASE PROCEDURE
 
   - lib/Mail/SpamAssassin.pm
 
+
+-- 2011-02-04 - STILL TO BE DONE -- 
 - [X.Y.0 RELEASES ONLY]: NOTE: This may change, make sure this info is
   still accurate before changing this (preferrably find out BEFORE doing
   an X.Y.0 release.  Update the mkupdates stuff:
@@ -355,8 +362,12 @@ SPAMASSASSIN RELEASE PROCEDURE
         cd /home/updatesd/svn/spamassassin/build/mkupdates
         sudo -u updatesd ./update-rules-3.3 3.3
 
+-- END STILL TO BE DONE --
+
 - publish the tarballs.
 
+  All of this refers to working on people.apache.org.
+
   (for rc and prerelease builds) copy the tarballs to the website.
   ASF bylaws prohibit the distribution of files claiming to be
   releases from the website, without 3 PMC +1 votes, so you need to
@@ -374,16 +385,14 @@ SPAMASSASSIN RELEASE PROCEDURE
   (for full release builds) copy the tarballs to www.apache.org/dist:
 
         version=X.Y.Z
-        cp -p ~/public_html/devel/Mail-SpamAssassin*-$version.* \
-            /www/www.apache.org/dist/spamassassin/source
+        cp -p ~/public_html/devel/Mail-SpamAssassin*-$version.* /www/www.apache.org/dist/spamassassin/source
 
         cd /www/www.apache.org/dist/spamassassin
         cp -p source/Mail-SpamAssassin*-$version.* .
 
         chmod -R g+w /www/www.apache.org/dist/spamassassin
 
-  [note: the ASF archives documentation claims that symlinks are
-  supported. This is not the case for some mirrors, so use "cp" instead.]
+  [note: the ASF archives documentation claims that symlinks are supported. This is not the case for some mirrors, so use "cp" instead.]
 
 - (for full release builds) update the main website "downloads" page:
 
@@ -430,12 +439,6 @@ SPAMASSASSIN RELEASE PROCEDURE
         svn up
         svn commit -m "added new release to website"
 
-- Push to live:
-
-        ssh people.apache.org
-        cd /www/spamassassin.apache.org
-        svn up
-
 - update the tag used to point to "current release":
 
     repo=https://svn.apache.org/repos/asf/spamassassin

Modified: spamassassin/trunk/build/update_website_docs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/update_website_docs?rev=1567213&r1=1567212&r2=1567213&view=diff
==============================================================================
--- spamassassin/trunk/build/update_website_docs (original)
+++ spamassassin/trunk/build/update_website_docs Tue Feb 11 16:46:56 2014
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 WEBDIR=/var/www/buildbot.spamassassin.org/staging/website
-vers=3.3.x
+vers=3.4.x
 
 if [ -z "$PERL" ]; then
   if [ -x /home/jm/perl584/bin/perl ]; then
     PERL=/home/jm/perl584/bin/perl
   else
-    PERL=perl
+    PERL=/usr/local/bin/perl
   fi
 fi