Skip to content

Commit b96dca5

Browse files
flohuemerflohuemer
committed
Switch from jdk-16 to jdk-17
1 parent c43db7c commit b96dca5

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎common.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.3-b01", "platformspecific": true },
1212
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+2-jvmci-21.3-b01", "platformspecific": true },
1313

14-
"oraclejdk16": {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
15-
"labsjdk-ce-16": {"name": "labsjdk", "version": "ce-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
16-
"labsjdk-ce-16Debug": {"name": "labsjdk", "version": "ce-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true },
17-
"labsjdk-ee-16": {"name": "labsjdk", "version": "ee-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
18-
"labsjdk-ee-16Debug": {"name": "labsjdk", "version": "ee-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true }
14+
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
15+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17+26-jvmci-21.3-b01", "platformspecific": true },
16+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17+26-jvmci-21.3-b01-debug", "platformspecific": true },
17+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.1+1-jvmci-21.3-b01", "platformspecific": true },
18+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.1+1-jvmci-21.3-b01-debug", "platformspecific": true }
1919
},
2020

2121
"COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
2222
"devkits": {
2323
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2424
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2525
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
26-
"windows-jdk16": { "packages" : { "devkit:VS2019-16.7.2+1" : "==1" }}
26+
"windows-jdk17": { "packages" : { "devkit:VS2019-16.9.3+1" : "==0" }}
2727
},
2828
"deps": {
2929
"common": {

‎common.jsonnet‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ local common_json = (import "common.json");
1313
},
1414
},
1515

16-
jdk16: {
16+
jdk17: {
1717
downloads+: {
18-
JAVA_HOME: common_json.jdks["oraclejdk16"],
18+
JAVA_HOME: common_json.jdks["oraclejdk17"],
1919
},
2020
},
2121

@@ -87,7 +87,7 @@ local common_json = (import "common.json");
8787
capabilities: ['windows', 'amd64'],
8888
},
8989

90-
windows_jdk16: self.windows + common_json.devkits["windows-jdk16"] + {
90+
windows_jdk17: self.windows + common_json.devkits["windows-jdk17"] + {
9191
setup+: [
9292
['set-export', 'DEVKIT_VERSION', '2019'],
9393
],

‎graal-js/ci.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ local common = import '../common.jsonnet';
7474
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'tck'}} + {name: 'js-gate-tck-jdk8-linux-amd64'},
7575
graalJs + common.jdk8 + common.gate + common.linux + webassemblyTest + {name: 'js-gate-webassembly-jdk8-linux-amd64'},
7676
graalJs + common.jdk8 + common.gate + common.linux + nativeImageSmokeTest + {name: 'js-gate-native-image-smoke-test-jdk8-linux-amd64'},
77-
graalJs + common.jdk16 + common.daily + common.linux + nativeImageSmokeTest + {name: 'js-daily-native-image-smoke-test-jdk16-linux-amd64'},
77+
graalJs + common.jdk17 + common.daily + common.linux + nativeImageSmokeTest + {name: 'js-daily-native-image-smoke-test-jdk17-linux-amd64'},
7878

7979
// jdk 8 - coverage
8080
graalJs + common.jdk8 + common.weekly + common.linux + gateCoverage + {environment+: {TAGS: 'build,default,tck'}} + {name: 'js-coverage-jdk8-linux-amd64'},
@@ -94,7 +94,7 @@ local common = import '../common.jsonnet';
9494
graalJs + common.jdk11 + common.gate + common.windows_jdk11 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk11-windows-amd64'},
9595

9696
// jdk 16 - linux
97-
graalJs + common.jdk16 + common.daily + common.linux + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-daily-default-jdk16-linux-amd64'},
97+
graalJs + common.jdk17 + common.daily + common.linux + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-daily-default-jdk17-linux-amd64'},
9898

9999
// interop benchmarks
100100
graalJs + common.jdk8 + common.bench + common.x52 + interopJmhBenchmarks + {name: 'js-bench-interop-jmh-jdk8-linux-amd64'},

‎graal-js/mx.graal-js/suite.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "5aa724e48260c9e03e579f940d300fc76f509b68",
27+
"version" : "619ab20d4a1ed0a1acb4b18f47f6913008c7adbc",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

‎graal-nodejs/ci.jsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ local common = import '../common.jsonnet';
6060
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk8-windows-amd64'},
6161
graalNodeJs + common.jdk11 + common.gate + common.windows_jdk11 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk11-windows-amd64'},
6262
// disabled due to GR-26245
63-
// graalNodeJs + common.jdk16 + common.gate + common.windows_jdk16 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk16-windows-amd64'},
63+
// graalNodeJs + common.jdk17 + common.gate + common.windows_jdk17 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk17-windows-amd64'},
6464
graalNodeJs + common.jdk8 + common.gate + common.linux + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-linux-amd64'},
6565
graalNodeJs + common.jdk8 + common.gate + common.darwin + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-darwin-amd64', timelimit: '55:00'},
6666
graalNodeJs + common.jdk11 + common.gate + common.linux + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-linux-amd64'},
@@ -86,9 +86,9 @@ local common = import '../common.jsonnet';
8686
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + testNode + {environment+: {SUITE: 'sequential', PART: '-r0,1', MAX_HEAP: '512M'}} + {name: 'nodejs-gate-sequential-jdk8-windows-amd64'},
8787

8888
// daily
89-
graalNodeJs + common.jdk16 + common.daily + common.linux + common.gateTags + {environment+: {TAGS: 'all'}} + {name: 'nodejs-daily-jdk16-linux-amd64'},
90-
graalNodeJs + common.jdk16 + common.daily + common.linux + gateSubstrateVm + {name: 'nodejs-daily-substratevm-jdk16-linux-amd64'},
91-
graalNodeJs + common.jdk16 + common.daily + common.windows_jdk16 + gateSubstrateVm + {name: 'nodejs-daily-substratevm-jdk16-windows-amd64'},
89+
graalNodeJs + common.jdk17 + common.daily + common.linux + common.gateTags + {environment+: {TAGS: 'all'}} + {name: 'nodejs-daily-jdk17-linux-amd64'},
90+
graalNodeJs + common.jdk17 + common.daily + common.linux + gateSubstrateVm + {name: 'nodejs-daily-substratevm-jdk17-linux-amd64'},
91+
graalNodeJs + common.jdk17 + common.daily + common.windows_jdk17 + gateSubstrateVm + {name: 'nodejs-daily-substratevm-jdk17-windows-amd64'},
9292

9393
// post-merges
9494
graalNodeJs + common.jdk8 + common.postMerge + common.linux + testNode + {environment+: {SUITE: parallelHttp2, PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-postmerge-parallel-http2-jdk8-linux-amd64'},

0 commit comments

Comments
 (0)