Skip to content

Commit 3339334

Browse files
Automatic merge of master into galahad
2 parents 7a6e754 + 25e30b4 commit 3339334

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.38.0",
7+
"mx_version": "7.40.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

graal-common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
33
"ci": {
4-
"overlay": "1ccfff0314b5dded71da964c0db7d512f33dfa39"
4+
"overlay": "17e07f85c9c36fd71adf68bc4056a3b8299ce866"
55
}
66
}

sulong/mx.sulong/suite.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,12 @@
322322
"sdk:POLYGLOT_TCK",
323323
],
324324
"buildDependencies" : [
325-
"NATIVE_MODE_SUPPORT",
326325
"SULONG_TCK_NATIVE",
327326
],
327+
"os" : {
328+
"windows" : {"ignore": "Native mode is not supported on Windows"},
329+
"<others>" : {},
330+
},
328331
"checkstyle" : "com.oracle.truffle.llvm.runtime",
329332
"javaCompliance" : "17+",
330333
"workingSets" : "Truffle, LLVM",

0 commit comments

Comments
 (0)