Merge pull request #7433 from dotty-staging/ci-cache

Update CI image to use a proxy

Author: smarter

.drone.yml

@@ -27,7 +27,7 @@ steps:
 
 - name: test
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/1/ && cd /tmp/1/
@@ -36,7 +36,7 @@ steps:
 
 - name: test_bootstrapped
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/2/ && cd /tmp/2/
@@ -45,7 +45,7 @@ steps:
 
 - name: community_build
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/3/ && cd /tmp/3/
@@ -55,7 +55,7 @@ steps:
 
 - name: test_sbt
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/4/ && cd /tmp/4/
@@ -67,7 +67,7 @@ steps:
 
 - name: test_java11
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on: [ clone ]
   commands:
   - export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
@@ -81,7 +81,7 @@ steps:
 
 - name: documentation
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on:
   - test
   - test_bootstrapped
@@ -100,7 +100,7 @@ steps:
 
 - name: publish_nightly
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on:
   - test
   - test_bootstrapped
@@ -127,7 +127,7 @@ steps:
 
 - name: publish_release
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on:
   - test
   - test_bootstrapped
@@ -170,7 +170,7 @@ steps:
 
 - name: publish_sbt_release
   pull: default
-  image: lampepfl/dotty:2019-09-19
+  image: lampepfl/dotty:2019-10-17
   depends_on:
   - test
   - test_bootstrapped

project/Build.scala

@@ -1062,7 +1062,7 @@ object Build {
         "-Dplugin.scalaVersion=" + dottyVersion,
         "-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
       ),
-      // By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
+      // Pass along ivy home setting to sbt instances run from the tests
       scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
       scriptedBufferLog := true,
       scripted := scripted.dependsOn(

project/scripts/sbt

@@ -11,7 +11,6 @@ sbt -J-Xmx4096m \
     -J-XX:ReservedCodeCacheSize=512m \
     -J-XX:MaxMetaspaceSize=1024m \
     -Ddotty.drone.mem=4096m \
-    -Dsbt.ivy.home=/var/cache/drone/ivy2 \
     -DSBT_PGP_USE_GPG=false \
     -no-colors \
     "$CMD"