Skip to content

Commit abc49bd

Browse files
authored
Rebootstrap main branch (#5158)
Pulls in @arturaz's notify `--watch` changes (#5068) and runBackground changes (#5115) for dogfooding
1 parent 224a6a4 commit abc49bd

File tree

4 files changed

+5
-51
lines changed

4 files changed

+5
-51
lines changed

build.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//| mill-version: 1.0.0-M1-13-54815e
1+
//| mill-version: 1.0.0-M1-30-aa7125
22
//| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m"]
33
//| mill-opts: ["--jobs=0.5C"]
44

@@ -128,7 +128,7 @@ val bridgeScalaVersions = Seq(
128128
// on the fly anyway. For publishing, we publish everything or a specific version
129129
// if given.
130130
val compilerBridgeScalaVersions =
131-
interp.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
131+
mill.define.BuildCtx.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
132132
case None | Some("") | Some("none") => Seq.empty[String]
133133
case Some("all") => (essentialBridgeScalaVersions ++ bridgeScalaVersions).distinct
134134
case Some("essential") => essentialBridgeScalaVersions
@@ -185,7 +185,7 @@ def formatDep(dep: Dep) = {
185185
s"${d.module.organization.value}:${d.module.name.value}:${d.versionConstraint.asString}"
186186
}
187187

188-
def listIn(path: os.Path) = interp.watchValue(os.list(path).map(_.last))
188+
def listIn(path: os.Path) = mill.define.BuildCtx.watchValue(os.list(path).map(_.last))
189189

190190
val dummyDeps: Seq[Dep] = Seq(
191191
Deps.DocDeps.millScip,

ci/mill-bootstrap.patch

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +0,0 @@
1-
diff --git a/build.mill b/build.mill
2-
index 4465e163a55..6b8da38aae7 100644
3-
--- a/build.mill
4-
+++ b/build.mill
5-
@@ -124,7 +124,7 @@ val bridgeScalaVersions = Seq(
6-
// on the fly anyway. For publishing, we publish everything or a specific version
7-
// if given.
8-
val compilerBridgeScalaVersions =
9-
- interp.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
10-
+ mill.define.BuildCtx.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
11-
case None | Some("") | Some("none") => Seq.empty[String]
12-
case Some("all") => (essentialBridgeScalaVersions ++ bridgeScalaVersions).distinct
13-
case Some("essential") => essentialBridgeScalaVersions
14-
@@ -181,7 +181,7 @@ def formatDep(dep: Dep) = {
15-
s"${d.module.organization.value}:${d.module.name.value}:${d.versionConstraint.asString}"
16-
}
17-
18-
-def listIn(path: os.Path) = interp.watchValue(os.list(path).map(_.last))
19-
+def listIn(path: os.Path) = mill.define.BuildCtx.watchValue(os.list(path).map(_.last))
20-
21-
val dummyDeps: Seq[Dep] = Seq(
22-
Deps.DocDeps.millScip,
23-
diff --git a/integration/package.mill b/integration/package.mill
24-
index a5183fc0a5a..4cb6f6689cd 100644
25-
--- a/integration/package.mill
26-
+++ b/integration/package.mill
27-
@@ -14,6 +14,7 @@ import mill.T
28-
import mill.define.Cross
29-
import mill.testrunner.TestResult
30-
import millbuild.*
31-
+import upickle.implicits.namedTuples.default.given
32-
33-
object `package` extends mill.Module {
34-
// We compile the test code once and then offer multiple modes to
35-
diff --git a/runner/codesig/package.mill b/runner/codesig/package.mill
36-
index 3950422474a..1ed233d24f7 100644
37-
--- a/runner/codesig/package.mill
38-
+++ b/runner/codesig/package.mill
39-
@@ -18,7 +18,7 @@ object `package` extends MillPublishScalaModule {
40-
41-
override lazy val test: CodeSigTests = new CodeSigTests {}
42-
trait CodeSigTests extends MillScalaTests {
43-
- val caseKeys = build.interp.watchValue(
44-
+ val caseKeys = mill.define.BuildCtx.watchValue(
45-
os.walk(moduleDir / "cases", maxDepth = 3)
46-
.map(_.subRelativeTo(moduleDir / "cases").segments)
47-
.collect { case Seq(a, b, c) => s"$a-$b-$c" }

integration/package.mill

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import mill.T
1414
import mill.define.Cross
1515
import mill.testrunner.TestResult
1616
import millbuild.*
17+
import upickle.implicits.namedTuples.default.given
1718

1819
object `package` extends mill.Module {
1920
// We compile the test code once and then offer multiple modes to

runner/codesig/package.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object `package` extends MillPublishScalaModule {
1818

1919
override lazy val test: CodeSigTests = new CodeSigTests {}
2020
trait CodeSigTests extends MillScalaTests {
21-
val caseKeys = build.interp.watchValue(
21+
val caseKeys = mill.define.BuildCtx.watchValue(
2222
os.walk(moduleDir / "cases", maxDepth = 3)
2323
.map(_.subRelativeTo(moduleDir / "cases").segments)
2424
.collect { case Seq(a, b, c) => s"$a-$b-$c" }

0 commit comments

Comments
 (0)