Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Jan 12, 2025
1 parent a20453f commit 2466c4e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,13 @@ class LauncherOldVersionsTests(version: String) extends UtestIntegrationTestSuit

// Run Mill once beforehand just to make sure it gets initialized and
// none of the initialization output gets into `outText`
os.call(
cmd = (launcherScript, "version"),
cwd = workspacePath,
stderr = os.Pipe,
env = Map("MILL_VERSION" -> version)
)
os.call(cmd = (launcherScript, "version"), cwd = workspacePath, stderr = os.Pipe)

val res = os.call(
cmd = (launcherScript, "version"),
cwd = workspacePath,
stderr = os.Pipe,
env = Map("MILL_VERSION" -> version)
)
val res = os.call(cmd = (launcherScript, "version"), cwd = workspacePath, stderr = os.Pipe)

val outText = res.out.text().trim
assert(outText == version)
os.call(
cmd = (launcherScript, "shutdown"),
cwd = workspacePath,
check = false,
env = Map("MILL_VERSION" -> version)
)
os.call(cmd = (launcherScript, "shutdown"), cwd = workspacePath, check = false)
os.remove.all(workspacePath / "out")
}
}
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fi

MILL_NATIVE_SUFFIX="-native"
FULL_MILL_VERSION=$MILL_VERSION

ARTIFACT_SUFFIX=""
case "$MILL_VERSION" in
*"$MILL_NATIVE_SUFFIX")
MILL_VERSION=${MILL_VERSION%"$MILL_NATIVE_SUFFIX"}
Expand Down

0 comments on commit 2466c4e

Please sign in to comment.