Skip to content

Commit a72e752

Browse files
author
Roman Kennke
committed
Merge tag 'vm-ce-22.0.0.2' into shenandoah
2 parents 3618e96 + e7d7572 commit a72e752

File tree

1,741 files changed

+66868
-44126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,741 files changed

+66868
-44126
lines changed

‎.github/workflows/main.yml

+27-9
Original file line numberDiff line numberDiff line change
@@ -45,44 +45,46 @@ jobs:
4545
matrix:
4646
include:
4747
- env:
48-
JDK: "openjdk8"
48+
JDK: "labsjdk-ce-17"
4949
GATE: "style,fullbuild"
5050
PRIMARY: "substratevm"
5151
- env:
52-
JDK: "openjdk8"
52+
JDK: "labsjdk-ce-17"
5353
GATE: "build,test"
5454
PRIMARY: "compiler"
5555
- env:
56-
JDK: "openjdk8"
56+
JDK: "labsjdk-ce-17"
5757
GATE: "build,test,helloworld"
5858
PRIMARY: "substratevm"
5959
- env:
60-
JDK: "openjdk8"
60+
JDK: "labsjdk-ce-17"
6161
GATE: "build,test,helloworld_debug"
6262
PRIMARY: "substratevm"
6363
- env:
64-
JDK: "openjdk8"
64+
JDK: "labsjdk-ce-17"
6565
GATE: "build,bootstraplite"
6666
PRIMARY: "compiler"
6767
- env:
68-
JDK: "openjdk8"
68+
JDK: "labsjdk-ce-17"
6969
GATE: "style,fullbuild,sulongBasic"
7070
PRIMARY: "sulong"
7171
- env:
72-
JDK: "openjdk8"
72+
JDK: "labsjdk-ce-17"
7373
GATE: "build,sulong"
7474
PRIMARY: "vm"
7575
DYNAMIC_IMPORTS: "/sulong,/substratevm"
7676
DISABLE_POLYGLOT: true
7777
DISABLE_LIBPOLYGLOT: true
7878
- env:
79-
JDK: "openjdk8"
79+
JDK: "labsjdk-ce-17"
8080
GATE: "build,debuginfotest"
8181
PRIMARY: "substratevm"
82+
GHA_EXPECTED_FAILURE: true # temporarily marked as expected failure due to #4018 / GR-35118
8283
- env:
8384
JDK: "labsjdk-ce-11"
8485
GATE: "build,debuginfotest"
8586
PRIMARY: "substratevm"
87+
GHA_EXPECTED_FAILURE: true # temporarily marked as expected failure due to #4018 / GR-35118
8688
- env:
8789
JDK: "labsjdk-ce-11"
8890
GATE: "hellomodule"
@@ -106,6 +108,10 @@ jobs:
106108
DYNAMIC_IMPORTS: "/tools,/substratevm,/sulong"
107109
NATIVE_IMAGES: "polyglot"
108110
WITHOUT_VCS: true
111+
- env:
112+
JDK: "labsjdk-ce-17"
113+
GATE: "style,fullbuild"
114+
PRIMARY: "espresso"
109115
steps:
110116
- uses: actions/checkout@v2
111117
with:
@@ -160,4 +166,16 @@ jobs:
160166
rm -rf .git
161167
fi
162168
163-
${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
169+
exit_code=0
170+
${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE} || exit_code=$?
171+
172+
if [[ -n "${GHA_EXPECTED_FAILURE}" ]]
173+
then
174+
if [[ ${exit_code} -eq 0 ]]
175+
then
176+
echo "Gate passed but was marked as expected failure."
177+
exit 25
178+
fi
179+
else
180+
exit ${exit_code}
181+
fi

‎ci.hocon

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
include "common.hocon"
22
labsjdk11: ${labsjdk-ce-11}
3+
labsjdk17: ${labsjdk-ce-17}
34

45
builds = []
56

67
binaries-repository = "lafo"
78

8-
#Truffle
9-
include "truffle/ci.hocon"
10-
119
#Compiler
1210
compiler-suite-root = "./compiler"
1311
logPatterns = [
1412
"*.bgv"
1513
${compiler-suite-root}"/graal_dumps/*/*"
14+
"*/es-*.json"
1615
]
1716

18-
#Tools
19-
include "tools/ci.hocon"
20-
21-
#Examples
22-
#Examples gate also disabled.
23-
#include "examples/ci.hocon"
24-
2517
jvm-config.default = "graal-core"
2618
libgraal_env = "libgraal"
2719
vm_subdir = "vm"
@@ -54,4 +46,3 @@ include "vm/ci_common/common-bench.hocon"
5446
include "vm/ci_includes/vm.hocon"
5547
include "vm/ci_includes/vm-native.hocon"
5648
include "vm/ci_includes/vm-bench.hocon"
57-
include "vm/ci_includes/vm-bench-sulong.hocon"

‎ci.jsonnet

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ local sdk = import 'sdk/ci.jsonnet';
1616
# Sulong
1717
local sulong = import 'sulong/ci.jsonnet';
1818

19+
# Tools
20+
local tools = import 'tools/ci.jsonnet';
21+
22+
# Truffle
23+
local truffle = import 'truffle/ci.jsonnet';
24+
1925
# JavaDoc
2026
local javadoc = import "ci_includes/publish-javadoc.jsonnet";
2127

@@ -39,6 +45,8 @@ local add_excludes_guard(build) = build + {
3945
regex.builds +
4046
sdk.builds +
4147
sulong.builds +
48+
tools.builds +
49+
truffle.builds +
4250
javadoc.builds
4351
)]
4452
}

‎ci_includes/publish-javadoc.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646

4747
local all_builds = [
48-
common.post_merge + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
48+
common.on_demand + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
4949
],
5050
// adds a "defined_in" field to all builds mentioning the location of this current file
5151
builds:: [{ defined_in: std.thisFile } + b for b in all_builds]

‎common.hocon

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
specVersion = "2"
22

3-
# oraclejdk* are released OracleJDK binaries
4-
# oraclejdk* are JDKs based on OracleJDK binaries
5-
# openjdk8 JDKs on Linux are built by Oracle Labs
6-
# openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
73
include "common.json"
84
include "graal-common.json"
95

@@ -43,7 +39,10 @@ labsjdk-ce-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ce-17Debug} }}
4339
labsjdk-ee-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ee-17Debug} }}
4440

4541
common : ${mx} ${deps.common} {
46-
catch_files : ${catch_files}
42+
catch_files : ${catch_files},
43+
logs : [
44+
"*/es-*.json"
45+
]
4746
}
4847

4948
linux : ${common} ${deps.linux}

‎common.json

+14-9
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-21.3-b03", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-22.0-b01", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u311+11-jvmci-22.0-b01-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.3-b03", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+9-jvmci-21.3-b03", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.14+9-jvmci-22.0-b05", "platformspecific": true },
12+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.14+9-jvmci-22.0-b05-sulong", "platformspecific": true },
13+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.14+8-jvmci-22.0-b05", "platformspecific": true },
14+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.14+8-jvmci-22.0-b05-sulong", "platformspecific": true },
1315

1416
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
15-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17+35-jvmci-21.3-b03", "platformspecific": true },
16-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17+35-jvmci-21.3-b03-debug", "platformspecific": true },
17-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.1+9-jvmci-21.3-b03", "platformspecific": true },
18-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.1+9-jvmci-21.3-b03-debug", "platformspecific": true }
17+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05", "platformspecific": true },
18+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05-debug", "platformspecific": true },
19+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.2+8-jvmci-22.0-b05-sulong", "platformspecific": true },
20+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05", "platformspecific": true },
21+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05-debug", "platformspecific": true },
22+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.2+8-jvmci-22.0-b05-sulong", "platformspecific": true }
1923
},
2024

2125
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -46,6 +50,7 @@
4650
"pip:isort": "==4.3.19",
4751
"pip:logilab-common": "==1.4.4",
4852
"pip:pylint": "==1.9.3",
53+
"pip:lazy-object-proxy": "==1.6.0",
4954
"pip:ninja_syntax": "==1.7.2"
5055
}
5156
},

‎common.jsonnet

+4-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,10 @@
105105
# enforce self.arch (useful for generating job names)
106106
arch:: error "self.arch not set",
107107
capabilities +: [],
108-
catch_files +: common_json.catch_files
108+
catch_files +: common_json.catch_files,
109+
logs : [
110+
"*/es-*.json"
111+
]
109112
},
110113

111114
linux:: deps.linux + self.common + {

0 commit comments

Comments
 (0)