From ffc423ad14955ae2fe7d7910070a4472487041e2 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 21 Nov 2019 17:47:08 +0100 Subject: [PATCH 1/2] Make the sbt scripted tests use the caching resolver The CI is setup to have https://github.com/lampepfl/dotty-drone/blob/master/dotty-docker/repositories as ~/.sbt/repositories to avoid hitting sonatype when an artifact is not present in the local cache, the sbt scripted tests were not respecting that setting so far because they use a different sbt boot directory. --- project/Build.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index cc248d8655b8..b626fcb32b58 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1041,8 +1041,12 @@ object Build { "-Dplugin.scalaVersion=" + dottyVersion, "-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469 ), - // Pass along ivy home setting to sbt instances run from the tests - scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList, + // Pass along ivy home and repositories settings to sbt instances run from the tests + scriptedLaunchOpts ++= { + val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath + s"-Dsbt.repository.config=$repositoryPath" :: + ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList + }, scriptedBufferLog := true, scripted := scripted.dependsOn( publishLocal in `dotty-sbt-bridge`, From 20501c16ea3ebadfd661592226283455d321fcbc Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 21 Nov 2019 17:50:30 +0100 Subject: [PATCH 2/2] Reenable the eff integration test eff has now been published for 2.13. --- sbt-dotty/sbt-test/scala2-compat/eff/build.sbt | 2 +- sbt-dotty/sbt-test/scala2-compat/eff/pending | 2 -- sbt-dotty/sbt-test/scala2-compat/eff/test | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 sbt-dotty/sbt-test/scala2-compat/eff/pending create mode 100644 sbt-dotty/sbt-test/scala2-compat/eff/test diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt b/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt index 0229055e2bad..953439793ce9 100644 --- a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt +++ b/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt @@ -1,4 +1,4 @@ scalaVersion := sys.props("plugin.scalaVersion") libraryDependencies += - ("org.atnos" %% "eff" % "5.4.1").withDottyCompat(scalaVersion.value) + ("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value) diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/pending b/sbt-dotty/sbt-test/scala2-compat/eff/pending deleted file mode 100644 index fbeaf3cad946..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/eff/pending +++ /dev/null @@ -1,2 +0,0 @@ -# pending because eff hasn't been published for 2.13 yet: https://github.com/atnos-org/eff/issues/185 -> compile diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/test b/sbt-dotty/sbt-test/scala2-compat/eff/test new file mode 100644 index 000000000000..5df2af1f3956 --- /dev/null +++ b/sbt-dotty/sbt-test/scala2-compat/eff/test @@ -0,0 +1 @@ +> compile