Skip to content

Commit 8b558ea

Browse files
lihaoyilihaoyi
authored
Fix handling of test claim.log file (#5864)
#5794 reverted a bunch of earlier changes accidentally during the merge, causing the prompt to show a `CLAIM` prefix and causing the chrome-profile test-class spans to not be generated. This PR puts those changes back in place, resulting in the unwanted `CLAIM` prefix disappearing from the prompt and causing the chrome-profile test-class spans to appear again Tested manually via `./mill-assembly.jar libs.javalib.test`
1 parent 3055286 commit 8b558ea

File tree

10 files changed

+276
-255
lines changed

10 files changed

+276
-255
lines changed

‎.github/workflows/run-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
- java-version: 17
170170
millargs: "'example.{cli,fundamentals,depth,extending,large}.__.local.daemon'"
171171

172-
- java-version: 17.0.14
172+
- java-version: 17.0.16
173173
millargs: "'integration.{feature,ide}.__.packaged.daemon'"
174174

175175
# run this specifically in `native` mode to make sure our non-JVM native image

‎.mill-jvm-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
zulu:17.0.14
1+
zulu:17.0.16

‎default-mill-jvm-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
zulu:17.0.14
1+
zulu:17.0.16

‎integration/ide/bsp-server-reload/resources/snapshots/broken/back/workspace-build-targets.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
],
4141
"jvmBuildTarget": {
4242
"javaHome": "java-home",
43-
"javaVersion": "17.0.14"
43+
"javaVersion": "17.0.16"
4444
}
4545
}
4646
},
@@ -80,7 +80,7 @@
8080
],
8181
"jvmBuildTarget": {
8282
"javaHome": "java-home",
83-
"javaVersion": "17.0.14"
83+
"javaVersion": "17.0.16"
8484
}
8585
}
8686
},
@@ -127,7 +127,7 @@
127127
],
128128
"jvmBuildTarget": {
129129
"javaHome": "java-home",
130-
"javaVersion": "17.0.14"
130+
"javaVersion": "17.0.16"
131131
}
132132
}
133133
},
@@ -185,7 +185,7 @@
185185
],
186186
"jvmBuildTarget": {
187187
"javaHome": "java-home",
188-
"javaVersion": "17.0.14"
188+
"javaVersion": "17.0.16"
189189
}
190190
}
191191
}

‎integration/ide/bsp-server-reload/resources/snapshots/broken/changed/workspace-build-targets.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
],
4141
"jvmBuildTarget": {
4242
"javaHome": "java-home",
43-
"javaVersion": "17.0.14"
43+
"javaVersion": "17.0.16"
4444
}
4545
}
4646
},
@@ -80,7 +80,7 @@
8080
],
8181
"jvmBuildTarget": {
8282
"javaHome": "java-home",
83-
"javaVersion": "17.0.14"
83+
"javaVersion": "17.0.16"
8484
}
8585
}
8686
},
@@ -127,7 +127,7 @@
127127
],
128128
"jvmBuildTarget": {
129129
"javaHome": "java-home",
130-
"javaVersion": "17.0.14"
130+
"javaVersion": "17.0.16"
131131
}
132132
}
133133
},
@@ -185,7 +185,7 @@
185185
],
186186
"jvmBuildTarget": {
187187
"javaHome": "java-home",
188-
"javaVersion": "17.0.14"
188+
"javaVersion": "17.0.16"
189189
}
190190
}
191191
}

‎integration/ide/bsp-server-reload/resources/snapshots/broken/start/workspace-build-targets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
],
4444
"jvmBuildTarget": {
4545
"javaHome": "java-home",
46-
"javaVersion": "17.0.14"
46+
"javaVersion": "17.0.16"
4747
}
4848
}
4949
},

‎integration/ide/bsp-server-reload/resources/snapshots/reload/changed/workspace-build-targets.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
],
3737
"jvmBuildTarget": {
3838
"javaHome": "java-home",
39-
"javaVersion": "17.0.14"
39+
"javaVersion": "17.0.16"
4040
}
4141
}
4242
},
@@ -83,7 +83,7 @@
8383
],
8484
"jvmBuildTarget": {
8585
"javaHome": "java-home",
86-
"javaVersion": "17.0.14"
86+
"javaVersion": "17.0.16"
8787
}
8888
}
8989
},
@@ -145,7 +145,7 @@
145145
],
146146
"jvmBuildTarget": {
147147
"javaHome": "java-home",
148-
"javaVersion": "17.0.14"
148+
"javaVersion": "17.0.16"
149149
}
150150
}
151151
}

‎integration/ide/bsp-server-reload/resources/snapshots/reload/start/workspace-build-targets.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
],
4141
"jvmBuildTarget": {
4242
"javaHome": "java-home",
43-
"javaVersion": "17.0.14"
43+
"javaVersion": "17.0.16"
4444
}
4545
}
4646
},
@@ -80,7 +80,7 @@
8080
],
8181
"jvmBuildTarget": {
8282
"javaHome": "java-home",
83-
"javaVersion": "17.0.14"
83+
"javaVersion": "17.0.16"
8484
}
8585
}
8686
},
@@ -127,7 +127,7 @@
127127
],
128128
"jvmBuildTarget": {
129129
"javaHome": "java-home",
130-
"javaVersion": "17.0.14"
130+
"javaVersion": "17.0.16"
131131
}
132132
}
133133
},
@@ -185,7 +185,7 @@
185185
],
186186
"jvmBuildTarget": {
187187
"javaHome": "java-home",
188-
"javaVersion": "17.0.14"
188+
"javaVersion": "17.0.16"
189189
}
190190
}
191191
}

‎integration/ide/bsp-server/resources/snapshots/workspace-build-targets.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dataKind": "jvm",
2828
"data": {
2929
"javaHome": "java-home",
30-
"javaVersion": "17.0.14"
30+
"javaVersion": "17.0.16"
3131
}
3232
},
3333
{
@@ -59,7 +59,7 @@
5959
"dataKind": "jvm",
6060
"data": {
6161
"javaHome": "java-home",
62-
"javaVersion": "17.0.14"
62+
"javaVersion": "17.0.16"
6363
}
6464
},
6565
{
@@ -98,7 +98,7 @@
9898
],
9999
"jvmBuildTarget": {
100100
"javaHome": "java-home",
101-
"javaVersion": "17.0.14"
101+
"javaVersion": "17.0.16"
102102
}
103103
}
104104
},
@@ -138,7 +138,7 @@
138138
],
139139
"jvmBuildTarget": {
140140
"javaHome": "java-home",
141-
"javaVersion": "17.0.14"
141+
"javaVersion": "17.0.16"
142142
}
143143
}
144144
},
@@ -178,7 +178,7 @@
178178
],
179179
"jvmBuildTarget": {
180180
"javaHome": "java-home",
181-
"javaVersion": "17.0.14"
181+
"javaVersion": "17.0.16"
182182
}
183183
}
184184
},
@@ -218,7 +218,7 @@
218218
],
219219
"jvmBuildTarget": {
220220
"javaHome": "java-home",
221-
"javaVersion": "17.0.14"
221+
"javaVersion": "17.0.16"
222222
}
223223
}
224224
},
@@ -258,7 +258,7 @@
258258
],
259259
"jvmBuildTarget": {
260260
"javaHome": "java-home",
261-
"javaVersion": "17.0.14"
261+
"javaVersion": "17.0.16"
262262
}
263263
}
264264
},
@@ -285,7 +285,7 @@
285285
"dataKind": "jvm",
286286
"data": {
287287
"javaHome": "java-home",
288-
"javaVersion": "17.0.14"
288+
"javaVersion": "17.0.16"
289289
}
290290
},
291291
{
@@ -314,7 +314,7 @@
314314
"dataKind": "jvm",
315315
"data": {
316316
"javaHome": "java-home",
317-
"javaVersion": "17.0.14"
317+
"javaVersion": "17.0.16"
318318
}
319319
},
320320
{
@@ -341,7 +341,7 @@
341341
"dataKind": "jvm",
342342
"data": {
343343
"javaHome": "java-home",
344-
"javaVersion": "17.0.14"
344+
"javaVersion": "17.0.16"
345345
}
346346
},
347347
{
@@ -380,7 +380,7 @@
380380
],
381381
"jvmBuildTarget": {
382382
"javaHome": "java-home",
383-
"javaVersion": "17.0.14"
383+
"javaVersion": "17.0.16"
384384
}
385385
}
386386
},
@@ -423,7 +423,7 @@
423423
],
424424
"jvmBuildTarget": {
425425
"javaHome": "java-home",
426-
"javaVersion": "17.0.14"
426+
"javaVersion": "17.0.16"
427427
}
428428
}
429429
},
@@ -450,7 +450,7 @@
450450
"dataKind": "jvm",
451451
"data": {
452452
"javaHome": "java-home",
453-
"javaVersion": "17.0.14"
453+
"javaVersion": "17.0.16"
454454
}
455455
},
456456
{
@@ -496,7 +496,7 @@
496496
],
497497
"jvmBuildTarget": {
498498
"javaHome": "java-home",
499-
"javaVersion": "17.0.14"
499+
"javaVersion": "17.0.16"
500500
}
501501
}
502502
},
@@ -543,7 +543,7 @@
543543
],
544544
"jvmBuildTarget": {
545545
"javaHome": "java-home",
546-
"javaVersion": "17.0.14"
546+
"javaVersion": "17.0.16"
547547
}
548548
}
549549
},
@@ -601,7 +601,7 @@
601601
],
602602
"jvmBuildTarget": {
603603
"javaHome": "java-home",
604-
"javaVersion": "17.0.14"
604+
"javaVersion": "17.0.16"
605605
}
606606
}
607607
}

0 commit comments

Comments
 (0)