diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:27:14 +0200 |
commit | 630bcc3e917179ff9d415513106e5b4e5065d4fb (patch) | |
tree | 6e0a59354c15ebfd499b342b62e9e0e008e5fa4d /scripts/jobs/integrate | |
parent | 0bcd0a40dcfda091bbb665b5f0879d9ce3384ab5 (diff) | |
parent | 1b7e660f74223a847b307613a8ab200923433b13 (diff) | |
download | scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.gz scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.tar.bz2 scala-630bcc3e917179ff9d415513106e5b4e5065d4fb.zip |
Merge commit '1b7e660' into merge-2.11-may-12
Diffstat (limited to 'scripts/jobs/integrate')
-rwxr-xr-x | scripts/jobs/integrate/ide | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/jobs/integrate/ide b/scripts/jobs/integrate/ide index 447f34f937..c39facbc3d 100755 --- a/scripts/jobs/integrate/ide +++ b/scripts/jobs/integrate/ide @@ -26,7 +26,7 @@ echo "maven.version.number=$scalaVersion" >> versions.properties # pass prRepoUrl in, which uber-build passes along to dbuild (in sbt-builds-for-ide) # the "-P pr-scala" maven arg accomplishes the same thing for maven (directly used in uber-build) -BASEDIR="$baseDir" prRepoUrl="$prRepoUrl" MAVEN_ARGS="-P pr-scala"\ +BASEDIR="$baseDir" prRepoUrl="$prRepoUrl" IDE_M2_REPO="$prRepoUrl" MAVEN_ARGS="-P pr-scala"\ $uberBuildDir/uber-build.sh $uberBuildDir/config/$uberBuildConfig $repo_ref $scalaVersion # uber-build puts its local repo under target/m2repo |