Skip to content

Commit 9cf8f2a

Browse files
woesswoess
committed
Fix windows devkit dependency.
1 parent f1b7125 commit 9cf8f2a

3 files changed

Lines changed: 16 additions & 15 deletions

File tree

‎common.jsonnet‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,28 +92,29 @@ local common_json = (import "common.json");
9292
capabilities: ['windows', 'amd64'],
9393
},
9494

95-
windows_vs2019: self.windows + {
96-
packages+: {
97-
'devkit:VS2019-16.5.3+1': '==0',
98-
},
95+
windows_jdk15: self.windows + common_json.devkits["windows-jdk15"] + {
9996
setup+: [
10097
['set-export', 'DEVKIT_ROOT', '$VS2019_16_5_3_1_0_ROOT'],
10198
['set-export', 'DEVKIT_VERSION', '2019'],
10299
],
103100
},
104101

105-
windows_vs2017: self.windows + {
106-
packages+: {
107-
'devkit:VS2017-15.5.5+1': '==0',
108-
},
102+
windows_jdk11: self.windows + common_json.devkits["windows-jdk11"] + {
103+
setup+: [
104+
['set-export', 'DEVKIT_ROOT', '$VS2017_15_9_24_1_0_ROOT'],
105+
['set-export', 'DEVKIT_VERSION', '2017'],
106+
],
107+
},
108+
109+
windows_jdk8: self.windows + common_json.devkits["windows-oraclejdk8"] + {
109110
setup+: [
110-
['set-export', 'DEVKIT_ROOT', '$VS2017_15_5_5_1_0_ROOT'],
111+
['set-export', 'DEVKIT_ROOT', '$VS2017_15_9_16_1_0_ROOT'],
111112
['set-export', 'DEVKIT_VERSION', '2017'],
112113
],
113114
},
114115

115116
# Note: VS2017 is only used for Node.js
116-
windows_vs2010: self.windows_vs2017 + {
117+
windows_vs2010: self.windows_jdk8 + {
117118
packages+: {
118119
msvc : '==10.0',
119120
},

‎graal-js/ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ local common = import '../common.jsonnet';
9393
graalJs + common.jdk11 + common.gate + common.linux_aarch64 + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk11-linux-aarch64'},
9494

9595
// jdk 11 - windows
96-
graalJs + common.jdk11 + common.gate + common.windows_vs2017 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk11-windows-amd64'},
96+
graalJs + common.jdk11 + common.gate + common.windows_jdk11 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk11-windows-amd64'},
9797

9898
// jdk 15 - linux
9999
graalJs + common.jdk15 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk15-linux-amd64'},

‎graal-nodejs/ci.jsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ local common = import '../common.jsonnet';
5959
graalNodeJs + common.jdk8 + common.gate + common.darwin + common.gateTags + {environment+: {TAGS: 'all'}} + {name: 'nodejs-gate-jdk8-darwin-amd64'},
6060
graalNodeJs + common.jdk11 + common.gate + common.darwin + common.gateTags + {environment+: {TAGS: 'all'}} + {name: 'nodejs-gate-jdk11-darwin-amd64'},
6161
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk8-windows-amd64'},
62-
graalNodeJs + common.jdk11 + common.gate + common.windows_vs2017 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk11-windows-amd64'},
62+
graalNodeJs + common.jdk11 + common.gate + common.windows_jdk11 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk11-windows-amd64'},
6363
// disabled due to GR-26245
64-
// graalNodeJs + common.jdk15 + common.gate + common.windows_vs2019 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk15-windows-amd64'},
64+
// graalNodeJs + common.jdk15 + common.gate + common.windows_jdk15 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk15-windows-amd64'},
6565
graalNodeJs + common.jdk8 + common.gate + common.linux + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-linux-amd64'},
6666
graalNodeJs + common.jdk8 + common.gate + common.darwin + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-darwin-amd64'},
6767
graalNodeJs + common.jdk11 + common.gate + common.linux + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-linux-amd64'},
6868
graalNodeJs + common.jdk11 + common.gate + common.darwin + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-darwin-amd64'},
6969
graalNodeJs + common.jdk15 + common.gate + common.linux + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk15-linux-amd64'},
7070
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-windows-amd64'},
71-
graalNodeJs + common.jdk11 + common.gate + common.windows_vs2017 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-windows-amd64'},
72-
graalNodeJs + common.jdk15 + common.gate + common.windows_vs2019 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk15-windows-amd64'},
71+
graalNodeJs + common.jdk11 + common.gate + common.windows_jdk11 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-windows-amd64'},
72+
graalNodeJs + common.jdk15 + common.gate + common.windows_jdk15 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk15-windows-amd64'},
7373

7474
graalNodeJs + common.jdk8 + common.gate + common.linux + buildAddons + testNode + {environment+: {SUITE: 'addons', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-addons-jdk8-linux-amd64'},
7575
graalNodeJs + common.jdk8 + common.gate + common.linux + buildNodeAPI + testNode + {environment+: {SUITE: 'node-api', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-node-api-jdk8-linux-amd64'},

0 commit comments

Comments
 (0)