Skip to content

Commit a26eb41

Browse files
woesswoess
committed
Use MSVC 2017 for JDK8 Windows builds.
1 parent 9cf8f2a commit a26eb41

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

‎common.jsonnet‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,6 @@ local common_json = (import "common.json");
113113
],
114114
},
115115

116-
# Note: VS2017 is only used for Node.js
117-
windows_vs2010: self.windows_jdk8 + {
118-
packages+: {
119-
msvc : '==10.0',
120-
},
121-
},
122-
123116
local gateCmd = ['mx', '--strict-compliance', 'gate', '-B=--force-deprecation-as-warning', '--strict-mode', '--tags', '${TAGS}'],
124117

125118
eclipse : {

‎graal-js/ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ local common = import '../common.jsonnet';
7979
graalJs + common.jdk8 + common.weekly + common.linux + gateCoverage + {environment+: {TAGS: 'build,default,tck'}} + {name: 'js-coverage-jdk8-linux-amd64'},
8080

8181
// jdk 8 - windows
82-
graalJs + common.jdk8 + common.gate + common.windows_vs2010 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk8-windows-amd64'},
82+
graalJs + common.jdk8 + common.gate + common.windows_jdk8 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk8-windows-amd64'},
8383

8484
// jdk 8 - sparc
8585
graalJs + common.jdk8 + common.gate + common.sparc + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk8-solaris-sparcv9'},

‎graal-nodejs/ci.jsonnet‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ local common = import '../common.jsonnet';
5858
graalNodeJs + common.jdk15 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'all'}} + {name: 'nodejs-gate-jdk15-linux-amd64'},
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'},
61-
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk8-windows-amd64'},
61+
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk8-windows-amd64'},
6262
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
6464
// graalNodeJs + common.jdk15 + common.gate + common.windows_jdk15 + common.gateTags + {environment+: {TAGS: 'windows'}} + {name: 'nodejs-gate-jdk15-windows-amd64'},
@@ -67,7 +67,7 @@ local common = import '../common.jsonnet';
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'},
70-
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-windows-amd64'},
70+
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk8-windows-amd64'},
7171
graalNodeJs + common.jdk11 + common.gate + common.windows_jdk11 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk11-windows-amd64'},
7272
graalNodeJs + common.jdk15 + common.gate + common.windows_jdk15 + gateSubstrateVm + {name: 'nodejs-gate-substratevm-jdk15-windows-amd64'},
7373

@@ -83,10 +83,10 @@ local common = import '../common.jsonnet';
8383
graalNodeJs + common.jdk8 + common.gate + common.linux + testNode + {environment+: {SUITE: parallelNoHttp2, PART: '-r3,5', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-parallel-4-jdk8-linux-amd64'},
8484
graalNodeJs + common.jdk8 + common.gate + common.linux + testNode + {environment+: {SUITE: parallelNoHttp2, PART: '-r4,5', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-parallel-5-jdk8-linux-amd64'},
8585

86-
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + testNode + {environment+: {SUITE: 'async-hooks', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-async-hooks-jdk8-windows-amd64'},
87-
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + testNode + {environment+: {SUITE: 'es-module', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-es-module-jdk8-windows-amd64'},
86+
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + testNode + {environment+: {SUITE: 'async-hooks', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-async-hooks-jdk8-windows-amd64'},
87+
graalNodeJs + common.jdk8 + common.gate + common.windows_jdk8 + testNode + {environment+: {SUITE: 'es-module', PART: '-r0,1', MAX_HEAP: '8G'}} + {name: 'nodejs-gate-es-module-jdk8-windows-amd64'},
8888
# We run the `sequential` tests with a smaller heap because `test/sequential/test-child-process-pass-fd.js` starts 80 child processes.
89-
graalNodeJs + common.jdk8 + common.gate + common.windows_vs2010 + testNode + {environment+: {SUITE: 'sequential', PART: '-r0,1', MAX_HEAP: '512M'}} + {name: 'nodejs-gate-sequential-jdk8-windows-amd64'},
89+
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'},
9090

9191
// post-merges
9292
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)