Merge branch 'publish-fix'

paulp · paulp · commit cc9d089f47b2 · 2012-02-03T16:01:40.000-08:00
Conflicts:
	tools/epfl-publish
diff --git a/tools/epfl-publish b/tools/epfl-publish
@@ -25,8 +25,8 @@ else
   echo "Publishing nightly build to $publish_to"
   # Archive Scala nightly distribution
   rsync -az dists/archives/ "$publish_to/distributions"
-  # don't publish docs in 2.8.x
-  [[ $version == "2.8.x" ]] || rsync -az build/scaladoc/ "$publish_to/docs"
+  # only publish scaladoc nightly for trunk
+  [[ $version == "master" ]] && rsync -az build/scaladoc/ "$publish_to/docs"
   # sbaz
   [[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$publish_to/sbaz"
 fi
