Skip to content
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.

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

Use -native Mill binary in Mill's own build #4294

Merged
merged 58 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
af3f67e
.
lihaoyi Jan 12, 2025
c0c6fc5
.
lihaoyi Jan 12, 2025
03b22dd
.
lihaoyi Jan 12, 2025
aca064d
.
lihaoyi Jan 12, 2025
aad0b8e
.
lihaoyi Jan 12, 2025
a20453f
.
lihaoyi Jan 12, 2025
2466c4e
.
lihaoyi Jan 12, 2025
d72821e
.
lihaoyi Jan 12, 2025
f57a34e
.
lihaoyi Jan 12, 2025
6798c51
.
lihaoyi Jan 12, 2025
88f473c
.
lihaoyi Jan 12, 2025
9256259
.
lihaoyi Jan 12, 2025
f0a80b1
.
lihaoyi Jan 12, 2025
97d27bf
.
lihaoyi Jan 12, 2025
2daa594
.
lihaoyi Jan 12, 2025
0f2a784
.
lihaoyi Jan 12, 2025
b69e6e6
.
lihaoyi Jan 12, 2025
9abc762
.
lihaoyi Jan 12, 2025
5968aea
.
lihaoyi Jan 12, 2025
fbd8c6c
.
lihaoyi Jan 12, 2025
e46349f
.
lihaoyi Jan 12, 2025
a3d16ad
.
lihaoyi Jan 12, 2025
8f65a00
.
lihaoyi Jan 12, 2025
b5da7c7
.
lihaoyi Jan 12, 2025
d577683
.
lihaoyi Jan 12, 2025
28bc05b
.
lihaoyi Jan 12, 2025
6748893
.
lihaoyi Jan 12, 2025
1cacb98
.
lihaoyi Jan 12, 2025
cf7fb05
.
lihaoyi Jan 12, 2025
e58b2f3
.
lihaoyi Jan 12, 2025
4c2cee8
.
lihaoyi Jan 12, 2025
f941b90
.
lihaoyi Jan 12, 2025
33d8d3b
.
lihaoyi Jan 12, 2025
6172a04
.
lihaoyi Jan 12, 2025
3ffb4eb
.
lihaoyi Jan 12, 2025
a06d1b5
.
lihaoyi Jan 12, 2025
4479608
.
lihaoyi Jan 12, 2025
25eec9d
.
lihaoyi Jan 12, 2025
2b972fb
.
lihaoyi Jan 12, 2025
4b5216b
.
lihaoyi Jan 12, 2025
c334af0
.
lihaoyi Jan 12, 2025
0c02493
.
lihaoyi Jan 12, 2025
c847f3b
.
lihaoyi Jan 12, 2025
39cb6b7
.
lihaoyi Jan 12, 2025
12caa19
.
lihaoyi Jan 12, 2025
d78619c
.
lihaoyi Jan 12, 2025
795f80b
.
lihaoyi Jan 12, 2025
a69aaa9
.
lihaoyi Jan 12, 2025
85724ed
.
lihaoyi Jan 12, 2025
7e7e119
.
lihaoyi Jan 12, 2025
81d728b
disable problematic test on windows
lihaoyi Jan 12, 2025
fedcec4
consolidate mill-init-error tests
lihaoyi Jan 12, 2025
256ad10
.
lihaoyi Jan 12, 2025
5a6e4b3
Merge branch 'cleanup-tests' into native-bootstrap
lihaoyi Jan 12, 2025
9bba18e
.
lihaoyi Jan 13, 2025
2cb62b0
.
lihaoyi Jan 13, 2025
597dc14
.
lihaoyi Jan 13, 2025
a956d54
.
lihaoyi Jan 13, 2025
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
Prev Previous commit
Next Next commit
.
lihaoyi committed Jan 12, 2025
commit 4b5216b6c49053f494a3cd447c82468812f79c4f
40 changes: 17 additions & 23 deletions runner/client/src/mill/runner/client/MillProcessLauncher.java
Original file line number Diff line number Diff line change
@@ -120,25 +120,19 @@ static String javaHome() throws IOException {
String javaHome = null;
if (Files.exists(millJvmVersionFile)) {
jvmId = Files.readString(millJvmVersionFile).trim();
;
javaHome = CoursierClient.resolveJavaHome(jvmId).getAbsolutePath();
}

if (javaHome == null || javaHome.isEmpty()) {
javaHome = System.getenv("JAVA_HOME");
System.err.println("javaHome: " + javaHome);
}

if (javaHome == null || javaHome.isEmpty()) javaHome = System.getProperty("java.home");

if (javaHome == null || javaHome.isEmpty()) javaHome = System.getenv("JAVA_HOME");
return javaHome;
}

static String javaExe() throws IOException {
String javaHome = javaHome();
if (javaHome == null) {
System.err.println("LHY javaHome == null");
return "java";
} else {
if (javaHome == null) return "java";
else {
final Path exePath = Paths.get(
javaHome + File.separator + "bin" + File.separator + "java" + (isWin() ? ".exe" : ""));

@@ -311,18 +305,18 @@ public static void prepareMillRunFolder(Path serverDir) throws Exception {
Files.createDirectories(sandbox);
boolean tputExists = checkTputExists();

// writeTerminalDims(tputExists, serverDir);
// Thread termInfoPropagatorThread = new Thread(
// () -> {
// try {
// while (true) {
// writeTerminalDims(tputExists, serverDir);
// Thread.sleep(100);
// }
// } catch (Exception e) {
// }
// },
// "TermInfoPropagatorThread");
// termInfoPropagatorThread.start();
writeTerminalDims(tputExists, serverDir);
Thread termInfoPropagatorThread = new Thread(
() -> {
try {
while (true) {
writeTerminalDims(tputExists, serverDir);
Thread.sleep(100);
}
} catch (Exception e) {
}
},
"TermInfoPropagatorThread");
termInfoPropagatorThread.start();
}
}