Skip to content

Commit c1b45e4

Browse files
jchaloujchalou
committed
[GR-48647] Add truffle gate builds on labsjdk-latest.
PullRequest: graal/15700
2 parents 6a64be0 + 6eca1bc commit c1b45e4

File tree

24 files changed

+165
-107
lines changed

24 files changed

+165
-107
lines changed

‎ci/common.jsonnet‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,11 @@ local common_json = import "../common.json";
9292
labsjdk20ce: self["labsjdk-ce-20"],
9393
labsjdk20ee: self["labsjdk-ee-20"],
9494

95-
labsjdkLatestCE: self["labsjdk-ce-21"],
96-
labsjdkLatestEE: self["labsjdk-ee-21"],
95+
labsjdk21ce: self["labsjdk-ce-21"],
96+
labsjdk21ee: self["labsjdk-ee-21"],
97+
98+
labsjdkLatestCE: self["labsjdk-ce-latest"],
99+
labsjdkLatestEE: self["labsjdk-ee-latest"],
97100

98101
oraclejdkLatest: self["oraclejdk-latest"],
99102
},

‎sdk/ci/ci.jsonnet‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
local utils = import '../../ci/ci_common/common-utils.libsonnet',
44

55
local sdk_gate = {
6+
downloads+: {
7+
EXTRA_JAVA_HOMES: common.jdks_data['oraclejdk21'],
8+
},
69
name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
710
setup: [
811
["cd", "./sdk"],
@@ -18,9 +21,9 @@
1821
},
1922

2023
builds: [
21-
common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt,
22-
common.linux_amd64 + common.oraclejdk17 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target,
23-
common.darwin_amd64 + common.oraclejdk21 + sdk_gate,
24-
common.darwin_amd64 + common.oraclejdk17 + sdk_gate + common.mach5_target,
24+
common.linux_amd64 + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt,
25+
common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target,
26+
common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,
27+
common.darwin_amd64 + common.oraclejdk21 + sdk_gate + common.mach5_target,
2528
]
2629
}

‎sdk/src/org.graalvm.collections/snapshot.sigtest‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CLSS public java.lang.Object
2424
cons public init()
2525
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
2626
meth protected void finalize() throws java.lang.Throwable
27-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
27+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
2828
meth public boolean equals(java.lang.Object)
2929
meth public final java.lang.Class<?> getClass()
3030
meth public final void notify()
@@ -114,14 +114,14 @@ meth public boolean isEmpty()
114114
meth public int size()
115115
meth public java.lang.Iterable<{org.graalvm.collections.EconomicMapWrap%0}> getKeys()
116116
meth public java.lang.Iterable<{org.graalvm.collections.EconomicMapWrap%1}> getValues()
117+
meth public java.lang.String toString()
117118
meth public org.graalvm.collections.MapCursor<{org.graalvm.collections.EconomicMapWrap%0},{org.graalvm.collections.EconomicMapWrap%1}> getEntries()
118119
meth public void clear()
119120
meth public void replaceAll(java.util.function.BiFunction<? super {org.graalvm.collections.EconomicMapWrap%0},? super {org.graalvm.collections.EconomicMapWrap%1},? extends {org.graalvm.collections.EconomicMapWrap%1}>)
120121
meth public {org.graalvm.collections.EconomicMapWrap%1} get({org.graalvm.collections.EconomicMapWrap%0})
121122
meth public {org.graalvm.collections.EconomicMapWrap%1} put({org.graalvm.collections.EconomicMapWrap%0},{org.graalvm.collections.EconomicMapWrap%1})
122123
meth public {org.graalvm.collections.EconomicMapWrap%1} putIfAbsent({org.graalvm.collections.EconomicMapWrap%0},{org.graalvm.collections.EconomicMapWrap%1})
123124
meth public {org.graalvm.collections.EconomicMapWrap%1} removeKey({org.graalvm.collections.EconomicMapWrap%0})
124-
meth public java.lang.String toString()
125125
supr java.lang.Object
126126
hfds map
127127

@@ -183,7 +183,6 @@ meth public abstract java.util.concurrent.atomic.AtomicReferenceArray newLinearC
183183
meth public abstract org.graalvm.collections.LockFreePrefixTree$Node newNode(long)
184184
meth public abstract void shutdown()
185185
supr java.lang.Object
186-
hfds FAILED_ALLOCATION_EXCEPTION
187186

188187
CLSS public static org.graalvm.collections.LockFreePrefixTree$HeapAllocator
189188
outer org.graalvm.collections.LockFreePrefixTree
@@ -216,7 +215,7 @@ meth public java.util.concurrent.atomic.AtomicReferenceArray newLinearChildren(i
216215
meth public org.graalvm.collections.LockFreePrefixTree$Node newNode(long)
217216
meth public void shutdown()
218217
supr org.graalvm.collections.LockFreePrefixTree$Allocator
219-
hfds DEFAULT_HOUSEKEEPING_PERIOD_MILLIS,EXPECTED_MAX_HASH_NODE_SIZE,INITIAL_HASH_CHILDREN_PREALLOCATION_COUNT,INITIAL_LINEAR_CHILDREN_PREALLOCATION_COUNT,INITIAL_NODE_PREALLOCATION_COUNT,LOGGING,MAX_CHILDREN_PREALLOCATION_COUNT,MAX_NODE_PREALLOCATION_COUNT,MIN_HOUSEKEEPING_PERIOD_MILLIS,SIZE_CLASS_COUNT,hashChildrenPool,housekeepingThread,linearChildrenPool,missedHashChildrenRequestCounts,missedLinearChildrenRequestCounts,missedNodePoolRequestCount,nodePool
218+
hfds DEFAULT_HOUSEKEEPING_PERIOD_MILLIS,EXPECTED_MAX_HASH_NODE_SIZE,FAILED_ALLOCATION_EXCEPTION,INITIAL_HASH_CHILDREN_PREALLOCATION_COUNT,INITIAL_LINEAR_CHILDREN_PREALLOCATION_COUNT,INITIAL_NODE_PREALLOCATION_COUNT,INTERNAL_FAILURE_EXCEPTION,LOGGING,MAX_CHILDREN_PREALLOCATION_COUNT,MAX_NODE_PREALLOCATION_COUNT,MIN_HOUSEKEEPING_PERIOD_MILLIS,SIZE_CLASS_COUNT,UNSUPPORTED_SIZE_EXCEPTION,hashChildrenPool,housekeepingThread,linearChildrenPool,missedHashChildrenRequestCounts,missedLinearChildrenRequestCounts,missedNodePoolRequestCount,nodePool
220219
hcls HousekeepingThread
221220

222221
CLSS public abstract interface org.graalvm.collections.MapCursor<%0 extends java.lang.Object, %1 extends java.lang.Object>

‎sdk/src/org.graalvm.home/snapshot.sigtest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CLSS public java.lang.Object
88
cons public init()
99
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
1010
meth protected void finalize() throws java.lang.Throwable
11-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
11+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
1212
meth public boolean equals(java.lang.Object)
1313
meth public final java.lang.Class<?> getClass()
1414
meth public final void notify()

‎sdk/src/org.graalvm.nativeimage/snapshot.sigtest‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ intf java.lang.Comparable<{java.lang.Enum%0}>
1717
intf java.lang.constant.Constable
1818
meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
1919
meth protected final void finalize()
20+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="18")
2021
meth public final boolean equals(java.lang.Object)
2122
meth public final int compareTo({java.lang.Enum%0})
2223
meth public final int hashCode()
@@ -57,7 +58,7 @@ CLSS public java.lang.Object
5758
cons public init()
5859
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
5960
meth protected void finalize() throws java.lang.Throwable
60-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
61+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
6162
meth public boolean equals(java.lang.Object)
6263
meth public final java.lang.Class<?> getClass()
6364
meth public final void notify()

‎sdk/src/org.graalvm.options/snapshot.sigtest‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ intf java.lang.Comparable<{java.lang.Enum%0}>
1414
intf java.lang.constant.Constable
1515
meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
1616
meth protected final void finalize()
17+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="18")
1718
meth public final boolean equals(java.lang.Object)
1819
meth public final int compareTo({java.lang.Enum%0})
1920
meth public final int hashCode()
@@ -24,7 +25,7 @@ meth public final java.util.Optional<java.lang.Enum$EnumDesc<{java.lang.Enum%0}>
2425
meth public java.lang.String toString()
2526
meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String)
2627
supr java.lang.Object
27-
hfds name,ordinal
28+
hfds hash,name,ordinal
2829

2930
CLSS public abstract interface java.lang.Iterable<%0 extends java.lang.Object>
3031
meth public abstract java.util.Iterator<{java.lang.Iterable%0}> iterator()
@@ -35,7 +36,7 @@ CLSS public java.lang.Object
3536
cons public init()
3637
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
3738
meth protected void finalize() throws java.lang.Throwable
38-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
39+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
3940
meth public boolean equals(java.lang.Object)
4041
meth public final java.lang.Class<?> getClass()
4142
meth public final void notify()

‎sdk/src/org.graalvm.polyglot.tck/snapshot.sigtest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CLSS public java.lang.Object
1111
cons public init()
1212
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
1313
meth protected void finalize() throws java.lang.Throwable
14-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
14+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
1515
meth public boolean equals(java.lang.Object)
1616
meth public final java.lang.Class<?> getClass()
1717
meth public final void notify()

‎sdk/src/org.graalvm.polyglot/snapshot.sigtest‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ intf java.lang.Comparable<{java.lang.Enum%0}>
1717
intf java.lang.constant.Constable
1818
meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
1919
meth protected final void finalize()
20+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="18")
2021
meth public final boolean equals(java.lang.Object)
2122
meth public final int compareTo({java.lang.Enum%0})
2223
meth public final int hashCode()
@@ -27,7 +28,7 @@ meth public final java.util.Optional<java.lang.Enum$EnumDesc<{java.lang.Enum%0}>
2728
meth public java.lang.String toString()
2829
meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String)
2930
supr java.lang.Object
30-
hfds name,ordinal
31+
hfds hash,name,ordinal
3132

3233
CLSS public java.lang.Exception
3334
cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
@@ -48,7 +49,7 @@ CLSS public java.lang.Object
4849
cons public init()
4950
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
5051
meth protected void finalize() throws java.lang.Throwable
51-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
52+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
5253
meth public boolean equals(java.lang.Object)
5354
meth public final java.lang.Class<?> getClass()
5455
meth public final void notify()
@@ -213,7 +214,7 @@ meth public void close()
213214
meth public void close(boolean)
214215
supr java.lang.Object
215216
hfds EMPTY,ENGINES,currentAPI,dispatch,initializationException,receiver,shutdownHookInitialized
216-
hcls APIAccessImpl,EngineShutDownHook,ImplHolder,PolyglotInvalid
217+
hcls APIAccessImpl,ClassPathIsolation,EngineShutDownHook,ImplHolder,PolyglotInvalid
217218

218219
CLSS public final org.graalvm.polyglot.Engine$Builder
219220
outer org.graalvm.polyglot.Engine
@@ -230,7 +231,7 @@ meth public org.graalvm.polyglot.Engine$Builder sandbox(org.graalvm.polyglot.San
230231
meth public org.graalvm.polyglot.Engine$Builder serverTransport(org.graalvm.polyglot.io.MessageTransport)
231232
meth public org.graalvm.polyglot.Engine$Builder useSystemProperties(boolean)
232233
supr java.lang.Object
233-
hfds allowExperimentalOptions,boundEngine,customLogHandler,err,in,messageTransport,options,out,permittedLanguages,sandboxPolicy,useSystemProperties
234+
hfds allowExperimentalOptionSystemPropertyValue,allowExperimentalOptions,boundEngine,customLogHandler,err,in,messageTransport,options,out,permittedLanguages,sandboxPolicy,useSystemProperties
234235

235236
CLSS public final org.graalvm.polyglot.EnvironmentAccess
236237
fld public final static org.graalvm.polyglot.EnvironmentAccess INHERIT
@@ -362,7 +363,7 @@ fld public final static org.graalvm.polyglot.PolyglotAccess NONE
362363
innr public final Builder
363364
meth public static org.graalvm.polyglot.PolyglotAccess$Builder newBuilder()
364365
supr java.lang.Object
365-
hfds EMPTY,EMPTY_EVAL_ACCESS,allAccess,bindingsAccess,evalAccess
366+
hfds allAccess,bindingsAccess,evalAccess
366367

367368
CLSS public final org.graalvm.polyglot.PolyglotAccess$Builder
368369
outer org.graalvm.polyglot.PolyglotAccess

‎sdk/src/org.graalvm.word/snapshot.sigtest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CLSS public java.lang.Object
55
cons public init()
66
meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
77
meth protected void finalize() throws java.lang.Throwable
8-
anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9")
8+
anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="9")
99
meth public boolean equals(java.lang.Object)
1010
meth public final java.lang.Class<?> getClass()
1111
meth public final void notify()

‎truffle/ci/ci.jsonnet‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
},
3535

3636
local gate_lite = truffle_common + {
37-
name: 'gate-truffle-mac-lite-oraclejdk-' + self.jdk_version,
37+
name: 'gate-truffle-mac-lite-oraclejdk-' + self.jdk_name,
3838
run: [
3939
["mx", "build"],
4040
["mx", "unittest", "--verbose"],
4141
],
4242
},
4343

4444
local sigtest = truffle_common + {
45-
name: 'gate-truffle-sigtest-' + self.jdk_version,
45+
name: 'gate-truffle-sigtest-' + self.jdk_name,
4646
run: [
4747
["mx", "build"],
48-
["mx", "sigtest", "--check", (if self.jdk_version == 17 then "all" else "bin")],
48+
["mx", "sigtest", "--check", (if self.jdk_version == 21 then "all" else "bin")],
4949
],
5050
},
5151

5252
local simple_tool_maven_project_gate = truffle_common + {
53-
name: 'gate-external-mvn-simpletool-' + self.jdk_version,
53+
name: 'gate-external-mvn-simpletool-' + self.jdk_name,
5454
packages+: {
5555
maven: "==3.3.9"
5656
},
@@ -70,7 +70,7 @@
7070
},
7171

7272
local simple_language_maven_project_gate = truffle_common + {
73-
name: 'gate-external-mvn-simplelanguage-' + self.jdk_version,
73+
name: 'gate-external-mvn-simplelanguage-' + self.jdk_name,
7474
packages+: {
7575
maven: "==3.3.9",
7676
ruby: ">=2.1.0",
@@ -99,7 +99,10 @@
9999
},
100100

101101
local truffle_gate = truffle_common + common.deps.eclipse + common.deps.jdt {
102-
name: 'gate-truffle-oraclejdk-' + self.jdk_version,
102+
downloads+: {
103+
EXTRA_JAVA_HOMES: common.jdks_data['oraclejdk21'],
104+
},
105+
name: 'gate-truffle-oraclejdk-' + self.jdk_name,
103106
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
104107
},
105108

@@ -109,13 +112,16 @@
109112
[
110113
linux_amd64 + jdk + sigtest + guard,
111114
linux_amd64 + jdk + simple_tool_maven_project_gate + common.mach5_target,
112-
linux_amd64 + jdk + simple_language_maven_project_gate,
113115
darwin_amd64 + jdk + truffle_weekly + gate_lite + guard,
114-
] for jdk in [common.oraclejdk21]
116+
] for jdk in [common.oraclejdk21, common.oraclejdkLatest]
115117
]) +
116118
[
117-
linux_amd64 + common.oraclejdk17 + truffle_gate + guard + {timelimit: "45:00"},
118-
linux_amd64 + common.oraclejdk21 + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},
119+
# The simple_language_maven_project_gate uses native-image, so we must run on labsjdk rather than oraclejdk
120+
linux_amd64 + common.labsjdk21 + simple_language_maven_project_gate,
121+
linux_amd64 + common.labsjdkLatest + simple_language_maven_project_gate,
122+
123+
linux_amd64 + common.oraclejdk21 + truffle_gate + guard + {timelimit: "45:00"},
124+
linux_amd64 + common.oraclejdkLatest + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},
119125

120126
truffle_common + linux_amd64 + common.oraclejdk17 + guard {
121127
name: "gate-truffle-javadoc",
@@ -125,7 +131,7 @@
125131
],
126132
},
127133

128-
truffle_common + linux_amd64 + common.oraclejdk17 + guard {
134+
truffle_common + linux_amd64 + common.oraclejdk21 + guard {
129135
name: "gate-truffle-slow-path-unittests",
130136
run: [
131137
["mx", "build", "-n", "-c", "-A-Atruffle.dsl.GenerateSlowPathOnly=true"],
@@ -136,8 +142,8 @@
136142
],
137143
},
138144

139-
truffle_common + windows_amd64 + common.oraclejdk17 + devkits["windows-jdk17"] + guard {
140-
name: "gate-truffle-nfi-windows-17",
145+
truffle_common + windows_amd64 + common.oraclejdk21 + devkits["windows-jdk21"] + guard {
146+
name: "gate-truffle-nfi-windows-21",
141147
# TODO make that a full gate run
142148
# currently, some truffle unittests fail on windows
143149
run: [
@@ -146,8 +152,8 @@
146152
],
147153
},
148154

149-
truffle_common + linux_amd64 + common.oraclejdk17 + common.deps.eclipse + common.deps.jdt + guard + {
150-
name: "weekly-truffle-coverage-17-linux-amd64",
155+
truffle_common + linux_amd64 + common.oraclejdk21 + common.deps.eclipse + common.deps.jdt + guard + {
156+
name: "weekly-truffle-coverage-21-linux-amd64",
151157
run: [
152158
["mx", "--strict-compliance", "gate", "--strict-mode", "--jacoco-relativize-paths", "--jacoco-omit-src-gen", "--jacocout", "coverage", "--jacoco-format", "lcov"],
153159
],

0 commit comments

Comments
 (0)