Skip to content

Commit 2b3fc59

Browse files
committed
[GR-31183] Run all Truffle gates for 16.
PullRequest: graal/8951
2 parents e279970 + fefcb94 commit 2b3fc59

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

tools/ci.hocon

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ toolsWeekly: ${tools-weekly-notifications} {
2020
builds += [
2121
${linux-amd64} ${oraclejdk8} ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-8"},
2222
${linux-amd64} ${oraclejdk11} ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-11"},
23+
${linux-amd64} ${oraclejdk16} ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-16"},
2324
${linux-amd64} ${oraclejdk8} ${toolsCommon} {
2425
run : [
2526
["mx", "build"],
@@ -39,6 +40,9 @@ builds += [
3940
${darwin-amd64} ${oraclejdk11} ${toolsGateLite} ${toolsWeekly} {
4041
name: "gate-tools-mac-lite-oraclejdk-11"
4142
}
43+
${darwin-amd64} ${oraclejdk16} ${toolsGateLite} ${toolsWeekly} {
44+
name: "gate-tools-mac-lite-oraclejdk-16"
45+
}
4246
${linux-aarch64} ${labsjdk11} ${toolsGateLite} ${toolsWeekly} {
4347
name: "gate-tools-linux-aarch64-lite-labsjdk-11"
4448
}

tools/mx.tools/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# questions.
2222
#
2323
suite = {
24-
"mxversion": "5.271.0",
24+
"mxversion": "5.300.4",
2525
"name": "tools",
2626
"defaultLicense" : "GPLv2-CPE",
2727

truffle/ci.hocon

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,18 @@ simpleLanguageMavenProjectGate: {
8989
builds += [
9090
${linux-amd64} ${oraclejdk8} ${truffleCommon} {run : [["mx", "build"], ["mx", "sigtest", "--check", "all"]], targets : [gate], name: "gate-truffle-sigtest"},
9191
${linux-amd64} ${oraclejdk11} ${truffleCommon} {run : [["mx", "build"], ["mx", "sigtest", "--check", "bin"]], targets : [gate], name: "gate-truffle-sigtest-11"},
92+
${linux-amd64} ${oraclejdk16} ${truffleCommon} {run : [["mx", "build"], ["mx", "sigtest", "--check", "bin"]], targets : [gate], name: "gate-truffle-sigtest-16"},
9293

9394
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleToolMavenProjectGate} {name: "gate-external-mvn-simpletool-8"},
9495
${linux-amd64} ${labsjdk-ee-11} ${truffleCommon} ${simpleToolMavenProjectGate} {name: "gate-external-mvn-simpletool-11"},
96+
${linux-amd64} ${labsjdk-ee-16} ${truffleCommon} ${simpleToolMavenProjectGate} {name: "gate-external-mvn-simpletool-16"},
9597
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleLanguageMavenProjectGate} {name: "gate-external-mvn-simplelanguage-8"},
9698
${linux-amd64} ${labsjdk-ee-11} ${truffleCommon} ${simpleLanguageMavenProjectGate} {name: "gate-external-mvn-simplelanguage-11"},
99+
${linux-amd64} ${labsjdk-ee-16} ${truffleCommon} ${simpleLanguageMavenProjectGate} {name: "gate-external-mvn-simplelanguage-16"},
97100

98101
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-8"},
99102
${linux-amd64} ${oraclejdk11} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-oraclejdk-11"},
103+
${linux-amd64} ${oraclejdk16} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-oraclejdk-16"},
100104
${linux-amd64} ${oraclejdk8} ${truffleCommon} {
101105
run : [
102106
["mx", "build"],
@@ -122,6 +126,9 @@ builds += [
122126
${darwin-amd64} ${oraclejdk11} ${gateLite} ${truffleWeekly} {
123127
name: "gate-truffle-mac-lite-oraclejdk-11"
124128
},
129+
${darwin-amd64} ${oraclejdk16} ${gateLite} ${truffleWeekly} {
130+
name: "gate-truffle-mac-lite-oraclejdk-16"
131+
},
125132
${windows-amd64} ${oraclejdk8} ${truffleCommon} ${devkits.windows-oraclejdk8} {
126133
# TODO make that a full gate run
127134
# currently, some truffle unittests fail on windows

truffle/external_repos/simplelanguage/component/make_component.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ declare -r JAVA_VERSION="${1:?First argument must be java version.}"
4444
declare -r GRAALVM_VERSION="${2:?Second argument must be GraalVM version.}"
4545
if [[ $JAVA_VERSION == 1.8* ]]; then
4646
JRE="jre/"
47-
elif [[ $JAVA_VERSION == 11* ]]; then
48-
JRE=""
4947
else
50-
echo "Unkown java version: $JAVA_VERSION"
51-
exit 1
48+
JRE=""
5249
fi
5350
readonly COMPONENT_DIR="component_temp_dir"
5451
readonly LANGUAGE_PATH="$COMPONENT_DIR/$JRE/languages/sl"

truffle/mx.truffle/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# SOFTWARE.
4040
#
4141
suite = {
42-
"mxversion" : "5.292.5",
42+
"mxversion" : "5.300.4",
4343
"name" : "truffle",
4444
"version" : "21.2.0",
4545
"release" : False,

0 commit comments

Comments
 (0)