diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-02-06 09:13:55 +0100 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-02-06 09:13:55 +0100 |
| commit | 1b2eea91de3511e41fef77e667681cc474790248 (patch) | |
| tree | cb956a3b5ac6a19e52455dbe086a713ad1f27be9 /tools/epfl-publish | |
| parent | a015c08fda8b8556345a802d60557a3ecd627ccc (diff) | |
| parent | 28b2d0c13aba7156431076119c920c7dcee6dc77 (diff) | |
| download | scala-1b2eea91de3511e41fef77e667681cc474790248.tar.gz scala-1b2eea91de3511e41fef77e667681cc474790248.tar.bz2 scala-1b2eea91de3511e41fef77e667681cc474790248.zip | |
Merge branch 'master' into feature/pc-ctrie
Diffstat (limited to 'tools/epfl-publish')
| -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 |