Skip to content

Commit 51f6d6b

Browse files
authored
Set canary_version to JDK 23
1 parent 76a6334 commit 51f6d6b

File tree

5 files changed

+122
-112
lines changed

5 files changed

+122
-112
lines changed

.azure/azure-pipelines-daily.yml

Lines changed: 78 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
- job: canary_jobs
2626
dependsOn:
27-
- junit_jdk21
28-
- nonjunit_jdk21
29-
- inference_part1_jdk21
30-
- inference_part2_jdk21
31-
- typecheck_part1_jdk21
32-
- typecheck_part2_jdk21
27+
- junit_jdk23
28+
- nonjunit_jdk23
29+
- inference_part1_jdk23
30+
- inference_part2_jdk23
31+
- typecheck_part1_jdk23
32+
- typecheck_part2_jdk23
3333
pool:
3434
vmImage: 'ubuntu-latest'
3535
steps:
@@ -39,7 +39,7 @@ jobs:
3939
- job: junit_jdk11
4040
dependsOn:
4141
- canary_jobs
42-
- junit_jdk21
42+
- junit_jdk23
4343
pool:
4444
vmImage: 'ubuntu-latest'
4545
container: mdernst/cf-ubuntu-jdk11:latest
@@ -52,7 +52,7 @@ jobs:
5252
- job: junit_jdk17
5353
dependsOn:
5454
- canary_jobs
55-
- junit_jdk21
55+
- junit_jdk23
5656
pool:
5757
vmImage: 'ubuntu-latest'
5858
container: mdernst/cf-ubuntu-jdk17:latest
@@ -63,6 +63,9 @@ jobs:
6363
- bash: ./checker/bin-devel/test-cftests-junit.sh
6464
displayName: test-cftests-junit.sh
6565
- job: junit_jdk21
66+
dependsOn:
67+
- canary_jobs
68+
- junit_jdk23
6669
pool:
6770
vmImage: 'ubuntu-latest'
6871
container: mdernst/cf-ubuntu-jdk21:latest
@@ -73,9 +76,6 @@ jobs:
7376
- bash: ./checker/bin-devel/test-cftests-junit.sh
7477
displayName: test-cftests-junit.sh
7578
- job: junit_jdk23
76-
dependsOn:
77-
- canary_jobs
78-
- junit_jdk21
7979
pool:
8080
vmImage: 'ubuntu-latest'
8181
container: mdernst/cf-ubuntu-jdk23:latest
@@ -89,7 +89,7 @@ jobs:
8989
- job: nonjunit_jdk11
9090
dependsOn:
9191
- canary_jobs
92-
- nonjunit_jdk21
92+
- nonjunit_jdk23
9393
pool:
9494
vmImage: 'ubuntu-latest'
9595
container: mdernst/cf-ubuntu-jdk11:latest
@@ -101,7 +101,7 @@ jobs:
101101
- job: nonjunit_jdk17
102102
dependsOn:
103103
- canary_jobs
104-
- nonjunit_jdk21
104+
- nonjunit_jdk23
105105
pool:
106106
vmImage: 'ubuntu-latest'
107107
container: mdernst/cf-ubuntu-jdk17:latest
@@ -111,6 +111,9 @@ jobs:
111111
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
112112
displayName: test-cftests-nonjunit.sh
113113
- job: nonjunit_jdk21
114+
dependsOn:
115+
- canary_jobs
116+
- nonjunit_jdk23
114117
pool:
115118
vmImage: 'ubuntu-latest'
116119
container: mdernst/cf-ubuntu-jdk21:latest
@@ -120,9 +123,6 @@ jobs:
120123
- bash: ./checker/bin-devel/test-cftests-nonjunit.sh
121124
displayName: test-cftests-nonjunit.sh
122125
- job: nonjunit_jdk23
123-
dependsOn:
124-
- canary_jobs
125-
- nonjunit_jdk21
126126
pool:
127127
vmImage: 'ubuntu-latest'
128128
container: mdernst/cf-ubuntu-jdk23:latest
@@ -139,8 +139,8 @@ jobs:
139139
- job: inference_jdk11
140140
dependsOn:
141141
- canary_jobs
142-
- inference_part1_jdk21
143-
- inference_part2_jdk21
142+
- inference_part1_jdk23
143+
- inference_part2_jdk23
144144
pool:
145145
vmImage: 'ubuntu-latest'
146146
container: mdernst/cf-ubuntu-jdk11:latest
@@ -154,8 +154,8 @@ jobs:
154154
- job: inference_jdk17
155155
dependsOn:
156156
- canary_jobs
157-
- inference_part1_jdk21
158-
- inference_part2_jdk21
157+
- inference_part1_jdk23
158+
- inference_part2_jdk23
159159
pool:
160160
vmImage: 'ubuntu-latest'
161161
container: mdernst/cf-ubuntu-jdk17:latest
@@ -166,42 +166,42 @@ jobs:
166166
- bash: ./checker/bin-devel/test-cftests-inference.sh
167167
displayName: test-cftests-inference.sh
168168

169-
# Split into part1 and part2 only for the inference job that "canary_jobs" depends on.
170-
- job: inference_part1_jdk21
169+
- job: inference_jdk21
170+
dependsOn:
171+
- canary_jobs
172+
- inference_part1_jdk23
173+
- inference_part2_jdk23
171174
pool:
172175
vmImage: 'ubuntu-latest'
173176
container: mdernst/cf-ubuntu-jdk21:latest
174177
timeoutInMinutes: 90
175178
steps:
176179
- checkout: self
177180
fetchDepth: 25
178-
- bash: ./checker/bin-devel/test-cftests-inference-part1.sh
179-
displayName: test-cftests-inference-part1.sh
180-
- job: inference_part2_jdk21
181+
- bash: ./checker/bin-devel/test-cftests-inference.sh
182+
displayName: test-cftests-inference.sh
183+
184+
# Split into part1 and part2 only for the inference job that "canary_jobs" depends on.
185+
- job: inference_part1_jdk23
181186
pool:
182187
vmImage: 'ubuntu-latest'
183-
container: mdernst/cf-ubuntu-jdk21:latest
188+
container: mdernst/cf-ubuntu-jdk23:latest
184189
timeoutInMinutes: 90
185190
steps:
186191
- checkout: self
187192
fetchDepth: 25
188-
- bash: ./checker/bin-devel/test-cftests-inference-part2.sh
189-
displayName: test-cftests-inference-part2.sh
190-
191-
- job: inference_jdk23
192-
dependsOn:
193-
- canary_jobs
194-
- inference_part1_jdk21
195-
- inference_part2_jdk21
193+
- bash: ./checker/bin-devel/test-cftests-inference-part1.sh
194+
displayName: test-cftests-inference-part1.sh
195+
- job: inference_part2_jdk23
196196
pool:
197197
vmImage: 'ubuntu-latest'
198198
container: mdernst/cf-ubuntu-jdk23:latest
199199
timeoutInMinutes: 90
200200
steps:
201201
- checkout: self
202202
fetchDepth: 25
203-
- bash: ./checker/bin-devel/test-cftests-inference.sh
204-
displayName: test-cftests-inference.sh
203+
- bash: ./checker/bin-devel/test-cftests-inference-part2.sh
204+
displayName: test-cftests-inference-part2.sh
205205

206206

207207
# Do not run misc_job daily, because it does diffs that assume it is running in
@@ -210,8 +210,8 @@ jobs:
210210
- job: typecheck_jdk11
211211
dependsOn:
212212
- canary_jobs
213-
- typecheck_part1_jdk21
214-
- typecheck_part2_jdk21
213+
- typecheck_part1_jdk23
214+
- typecheck_part2_jdk23
215215
pool:
216216
vmImage: 'ubuntu-latest'
217217
container: mdernst/cf-ubuntu-jdk11-plus:latest
@@ -223,8 +223,8 @@ jobs:
223223
- job: typecheck_jdk17
224224
dependsOn:
225225
- canary_jobs
226-
- typecheck_part1_jdk21
227-
- typecheck_part2_jdk21
226+
- typecheck_part1_jdk23
227+
- typecheck_part2_jdk23
228228
pool:
229229
vmImage: 'ubuntu-latest'
230230
container: mdernst/cf-ubuntu-jdk17-plus:latest
@@ -233,6 +233,19 @@ jobs:
233233
fetchDepth: 1000
234234
- bash: ./checker/bin-devel/test-typecheck.sh
235235
displayName: test-typecheck.sh
236+
- job: typecheck_jdk
237+
dependsOn:
238+
- canary_jobs
239+
- typecheck_part1_jdk23
240+
- typecheck_part2_jdk23
241+
pool:
242+
vmImage: 'ubuntu-latest'
243+
container: mdernst/cf-ubuntu-jdk-plus:latest
244+
steps:
245+
- checkout: self
246+
fetchDepth: 1000
247+
- bash: ./checker/bin-devel/test-typecheck.sh
248+
displayName: test-typecheck.sh
236249
- job: typecheck_part1_jdk21
237250
pool:
238251
vmImage: 'ubuntu-latest'
@@ -250,26 +263,13 @@ jobs:
250263
- checkout: self
251264
fetchDepth: 1000
252265
- bash: ./checker/bin-devel/test-typecheck-part2.sh
253-
displayName: test-typecheck-part2.sh
254-
- job: typecheck_jdk23
255-
dependsOn:
256-
- canary_jobs
257-
- typecheck_part1_jdk21
258-
- typecheck_part2_jdk21
259-
pool:
260-
vmImage: 'ubuntu-latest'
261-
container: mdernst/cf-ubuntu-jdk23-plus:latest
262-
steps:
263-
- checkout: self
264-
fetchDepth: 1000
265-
- bash: ./checker/bin-devel/test-typecheck.sh
266-
displayName: test-typecheck.sh
266+
displayName: test-typecheck-part2.sh(23)
267267

268268
- job: daikon_jdk11
269269
dependsOn:
270270
- canary_jobs
271-
- daikon_part1_jdk21
272-
- daikon_part2_jdk21
271+
- daikon_part1_jdk23
272+
- daikon_part2_jdk23
273273
pool:
274274
vmImage: 'ubuntu-latest'
275275
container: mdernst/cf-ubuntu-jdk11:latest
@@ -282,8 +282,8 @@ jobs:
282282
- job: daikon_jdk17
283283
dependsOn:
284284
- canary_jobs
285-
- daikon_part1_jdk21
286-
- daikon_part2_jdk21
285+
- daikon_part1_jdk23
286+
- daikon_part2_jdk23
287287
pool:
288288
vmImage: 'ubuntu-latest'
289289
container: mdernst/cf-ubuntu-jdk17:latest
@@ -317,11 +317,21 @@ jobs:
317317
fetchDepth: 25
318318
- bash: ./checker/bin-devel/test-daikon.sh
319319
displayName: test-daikon-part2.sh
320-
- job: daikon_jdk23
320+
- job: daikon_part1_jdk23
321+
dependsOn:
322+
- canary_jobs
323+
pool:
324+
vmImage: 'ubuntu-latest'
325+
container: mdernst/cf-ubuntu-jdk23:latest
326+
timeoutInMinutes: 70
327+
steps:
328+
- checkout: self
329+
fetchDepth: 25
330+
- bash: ./checker/bin-devel/test-daikon-part1.sh
331+
displayName: test-daikon.sh
332+
- job: daikon_part2_jdk23
321333
dependsOn:
322334
- canary_jobs
323-
- daikon_part1_jdk21
324-
- daikon_part2_jdk21
325335
pool:
326336
vmImage: 'ubuntu-latest'
327337
container: mdernst/cf-ubuntu-jdk23:latest
@@ -330,13 +340,13 @@ jobs:
330340
- checkout: self
331341
fetchDepth: 25
332342
- bash: ./checker/bin-devel/test-daikon.sh
333-
displayName: test-daikon.sh
343+
displayName: test-daikon-part2.sh
334344

335-
## I'm not sure why the guava_jdk11 job is failing (it's due to Error Prone).
345+
## I think the guava_jdk11 job is failing due to Error Prone not supporting JDK 11.
336346
- job: guava_jdk17
337347
dependsOn:
338348
- canary_jobs
339-
- guava_jdk21
349+
- guava_jdk23
340350
pool:
341351
vmImage: 'ubuntu-latest'
342352
container: mdernst/cf-ubuntu-jdk17:latest
@@ -349,6 +359,7 @@ jobs:
349359
- job: guava_jdk21
350360
dependsOn:
351361
- canary_jobs
362+
- guava_jdk23
352363
pool:
353364
vmImage: 'ubuntu-latest'
354365
container: mdernst/cf-ubuntu-jdk21:latest
@@ -361,7 +372,6 @@ jobs:
361372
- job: guava_jdk23
362373
dependsOn:
363374
- canary_jobs
364-
- guava_jdk21
365375
pool:
366376
vmImage: 'ubuntu-latest'
367377
container: mdernst/cf-ubuntu-jdk23:latest
@@ -375,7 +385,7 @@ jobs:
375385
- job: plume_lib_jdk11
376386
dependsOn:
377387
- canary_jobs
378-
- plume_lib_jdk21
388+
- plume_lib_jdk23
379389
pool:
380390
vmImage: 'ubuntu-latest'
381391
container: mdernst/cf-ubuntu-jdk11:latest
@@ -387,7 +397,7 @@ jobs:
387397
- job: plume_lib_jdk17
388398
dependsOn:
389399
- canary_jobs
390-
- plume_lib_jdk21
400+
- plume_lib_jdk23
391401
pool:
392402
vmImage: 'ubuntu-latest'
393403
container: mdernst/cf-ubuntu-jdk17:latest
@@ -399,6 +409,7 @@ jobs:
399409
- job: plume_lib_jdk21
400410
dependsOn:
401411
- canary_jobs
412+
- plume_lib_jdk23
402413
pool:
403414
vmImage: 'ubuntu-latest'
404415
container: mdernst/cf-ubuntu-jdk21:latest
@@ -410,7 +421,6 @@ jobs:
410421
- job: plume_lib_jdk23
411422
dependsOn:
412423
- canary_jobs
413-
- plume_lib_jdk21
414424
pool:
415425
vmImage: 'ubuntu-latest'
416426
container: mdernst/cf-ubuntu-jdk23:latest

.azure/azure-pipelines-daily.yml.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@ nonjunit_job(23)
5252
# So use a timeout of 90 minutes, and hope that is enough.
5353
inference_job(11)
5454
inference_job(17)
55-
inference_job_split(21)
56-
inference_job(23)
55+
inference_job(21)
56+
inference_job_split(23)
5757

5858
# Do not run misc_job daily, because it does diffs that assume it is running in
5959
# a pull request.
6060

6161
typecheck_job(11)
6262
typecheck_job(17)
63-
typecheck_job_split(21)
64-
typecheck_job(23)
63+
typecheck_job
64+
typecheck_job_split(21)(23)
6565

6666
daikon_job(11)
6767
daikon_job(17)
6868
daikon_job_split(21)
69-
daikon_job(23)
69+
daikon_job_split(23)
7070

71-
## I'm not sure why the guava_jdk11 job is failing (it's due to Error Prone).
71+
## I think the guava_jdk11 job is failing due to Error Prone not supporting JDK 11.
7272
guava_job(17)
7373
guava_job(21)
7474
guava_job(23)

0 commit comments

Comments
 (0)