mirror of https://github.com/sbt/sbt.git
use http for scripted tests
This commit is contained in:
parent
323fa95b7b
commit
0409173d56
|
|
@ -31,7 +31,6 @@ env:
|
|||
- SBT_CMD="scripted source-dependencies/*3of3"
|
||||
- SBT_CMD="scripted tests/*"
|
||||
- SBT_CMD="scripted project-load/*"
|
||||
- SBT_CMD="checkBuild"
|
||||
- SBT_CMD="repoOverrideTest:scripted dependency-management/*"
|
||||
- SBT_CMD="mavenResolverPluginTest:scripted dependency-management/*2of2"
|
||||
- SBT_CMD="mavenResolverPluginTest:scripted dependency-management/*1of2 project/transitive-plugins"
|
||||
|
|
|
|||
|
|
@ -535,7 +535,7 @@ def rootSettings = fullDocSettings ++
|
|||
Transform.conscriptSettings(bundledLauncherProj)
|
||||
def otherRootSettings = Seq(
|
||||
Scripted.scriptedPrescripted := { addSbtAlternateResolver _ },
|
||||
Scripted.scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G"),
|
||||
Scripted.scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G", "-Dsbt.repository.secure=false"),
|
||||
Scripted.scripted <<= scriptedTask,
|
||||
Scripted.scriptedUnpublished <<= scriptedUnpublishedTask,
|
||||
Scripted.scriptedSource := (sourceDirectory in sbtProj).value / "sbt-test",
|
||||
|
|
@ -544,7 +544,7 @@ def otherRootSettings = Seq(
|
|||
},
|
||||
aggregate in bintrayRelease := false
|
||||
) ++ inConfig(Scripted.MavenResolverPluginTest)(Seq(
|
||||
Scripted.scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G"),
|
||||
Scripted.scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G", "-Dsbt.repository.secure=false"),
|
||||
Scripted.scripted <<= scriptedTask,
|
||||
Scripted.scriptedUnpublished <<= scriptedUnpublishedTask,
|
||||
Scripted.scriptedPrescripted := { f =>
|
||||
|
|
@ -558,7 +558,9 @@ def otherRootSettings = Seq(
|
|||
)) ++ inConfig(Scripted.RepoOverrideTest)(Seq(
|
||||
Scripted.scriptedPrescripted := { _ => () },
|
||||
Scripted.scriptedLaunchOpts := {
|
||||
List("-XX:MaxPermSize=256M", "-Xmx1G", "-Dsbt.override.build.repos=true",
|
||||
List("-XX:MaxPermSize=256M", "-Xmx1G",
|
||||
"-Dsbt.repository.secure=false",
|
||||
"-Dsbt.override.build.repos=true",
|
||||
s"""-Dsbt.repository.config=${ Scripted.scriptedSource.value / "repo.config" }""")
|
||||
},
|
||||
Scripted.scripted <<= scriptedTask,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[repositories]
|
||||
local
|
||||
typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
|
||||
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
|
||||
|
|
|
|||
Loading…
Reference in New Issue