diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-03 16:01:40 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-03 16:01:40 -0800 |
| commit | cc9d089f47b2e85c018fdcb648d3bd22f7aaa088 (patch) | |
| tree | 53dd6260b2a26757d16d43694e835c28df14d2bb /tools | |
| parent | 4bbfed3f8fda69624ea6a96de52ba973f55900cf (diff) | |
| parent | b16cbcdf2eeca3e5bcd0601df3524df6d307704b (diff) | |
| download | scala-cc9d089f47b2e85c018fdcb648d3bd22f7aaa088.tar.gz scala-cc9d089f47b2e85c018fdcb648d3bd22f7aaa088.tar.bz2 scala-cc9d089f47b2e85c018fdcb648d3bd22f7aaa088.zip | |
Merge branch 'publish-fix'
Conflicts:
tools/epfl-publish
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/epfl-publish | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/epfl-publish b/tools/epfl-publish index 4982f930bb..de5e17b13f 100755 --- 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 |