diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-03 16:01:19 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-03 16:01:19 -0800 |
commit | 2229f696474497ae325f7a21353f580222283a9c (patch) | |
tree | 4e510024f7d0b5db4d9610bf2d8481caf375be39 | |
parent | 3d172956f77090f004e697df0e60996b754b9592 (diff) | |
parent | b16cbcdf2eeca3e5bcd0601df3524df6d307704b (diff) | |
download | scala-2229f696474497ae325f7a21353f580222283a9c.tar.gz scala-2229f696474497ae325f7a21353f580222283a9c.tar.bz2 scala-2229f696474497ae325f7a21353f580222283a9c.zip |
Merge branch 'publish-fix' into 2.8.x
Conflicts:
tools/epfl-publish
-rwxr-xr-x | tools/epfl-publish | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/tools/epfl-publish b/tools/epfl-publish index e9cd97b3d2..de5e17b13f 100755 --- a/tools/epfl-publish +++ b/tools/epfl-publish @@ -1,7 +1,6 @@ #!/usr/bin/env bash # # publishes nightly build if $publish_to is set in environment. -# alternate maven settings.xml file given in $maven_settings. # [[ $# -eq 1 ]] || { @@ -20,31 +19,14 @@ version="$1" exit 1 } -# should not be hardcoded -# adds -Dsettings.file= if fixed path is present -mavenSettingsOption () { - hardcoded_path="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" - - # environment variable - if [[ -n $maven_settings ]]; then - echo -Dsettings.file="$maven_settings" - elif [[ -f $hardcoded_path ]]; then - echo -Dsettings.file="$hardcoded_path" - fi -} - -mavenSettings=${maven_settings:-findMavenSettings} - if [[ -z $publish_to ]]; then echo "Nothing to publish." 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" - # Deploy the maven artifacts on scala-tools.org - ( cd dists/maven/latest && ant deploy.snapshot $(mavenSettingsOption) ) fi |