Skip to content

Update CI image to use a proxy #7433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Update CI image to use a proxy #7433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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/
Expand All @@ -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/
Expand All @@ -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/
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion project/scripts/sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"