Skip to content

Commit 2bc62e8

Browse files
committed
Do not run dotty/publishLocal automatically from dotty-library-bootstrapped/update
This seems to cause problems on the CI, this means that if you want to use the bootstrapped builds manually you need to remember to run publishLocal first.
1 parent acd9a1e commit 2bc62e8

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ pipeline:
1010
matrix:
1111
TEST:
1212
- test
13-
- dotty-compiler-bootstrapped/test
13+
- ;publishLocal;dotty-compiler-bootstrapped/test
1414
- partest-only-no-bootstrap --show-diff --verbose
1515
- partest-only --show-diff --verbose

project/Build.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,14 @@ object DottyBuild extends Build {
119119
addCommandAlias("run", "dotty-compiler/run") ++
120120
addCommandAlias(
121121
"partest",
122+
";publishLocal" +
122123
";dotty-compiler-bootstrapped/lockPartestFile" +
123124
";dotty-compiler-bootstrapped/test:test" +
124125
";dotty-compiler-bootstrapped/runPartestRunner"
125126
) ++
126127
addCommandAlias(
127128
"partest-only",
129+
";publishLocal" +
128130
";dotty-compiler-bootstrapped/lockPartestFile" +
129131
";dotty-compiler-bootstrapped/test:test-only dotc.tests" +
130132
";dotty-compiler-bootstrapped/runPartestRunner"
@@ -429,14 +431,15 @@ object DottyBuild extends Build {
429431
settings(commonBootstrappedSettings).
430432
settings(dottyLibrarySettings).
431433
settings(
434+
// FIXME: this breaks the CI (OutOfMemory errors) somehow
432435
// The non-bootstrapped compiler needs to be published first.
433-
update <<= update.dependsOn(Def.task {
434-
// This crazy stuff is equivalent to `dotty/publishLocal`, if we just did
435-
// `publishLocal in dotty` the aggregated projects would be ignored.
436-
val s = state.value
437-
val e = Project.extract(s)
438-
e.runAggregated(publishLocal in dotty, s)
439-
})
436+
// update <<= update.dependsOn(Def.task {
437+
// // This crazy stuff is equivalent to `dotty/publishLocal`, if we just did
438+
// // `publishLocal in dotty` the aggregated projects would be ignored.
439+
// val s = state.value
440+
// val e = Project.extract(s)
441+
// e.runAggregated(publishLocal in dotty, s)
442+
// })
440443
)
441444

442445
// until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)

0 commit comments

Comments
 (0)