diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2017-03-09 10:11:04 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2017-03-09 10:11:04 +0100 |
| commit | d2b293a4ec13b4c6f00e9d7dfbc89d4ba4ecd73f (patch) | |
| tree | 59efe7df8fc3a9382f326839d35cae8445fd469d /scripts | |
| parent | c309f9867a557d4edccaebfa399eabcef11bf1bf (diff) | |
| download | scala-d2b293a4ec13b4c6f00e9d7dfbc89d4ba4ecd73f.tar.gz scala-d2b293a4ec13b4c6f00e9d7dfbc89d4ba4ecd73f.tar.bz2 scala-d2b293a4ec13b4c6f00e9d7dfbc89d4ba4ecd73f.zip | |
Fix for repositories file in bootstrap scripts
When building quick and modules, the `scala-integrate` repo needs to be there
in order to find other modules. For example, partest needs xml. This should fix
the 2.13 build, it didn't fail in 2.12 because modules are not built.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index e40cfaa923..a071f3c45f 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -103,9 +103,10 @@ releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifacto # repo for the modules and the quick build integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"} -# the `releaseTempRepoUrl` needs to be in the repositories file for building quick (to get starr) and the modules. -# the file is re-generated for running the stability test, this time with the `integrationRepoUrl`. -generateRepositoriesConfig $releaseTempRepoUrl +# the `releaseTempRepoUrl` needs to be in the repositories file to get starr when building quick and the modules. +# `integrationRepoUrl` is there to find modules when building quick and other modules (e.g., partest requires xml). +# the file is re-generated for running the stability test, this time with only `integrationRepoUrl`. +generateRepositoriesConfig $releaseTempRepoUrl $integrationRepoUrl # ARGH trying to get this to work on multiple versions of sbt-extras... # the old version (on jenkins, and I don't want to upgrade for risk of breaking other builds) honors -sbt-dir |