Skip to content

Commit efca839

Browse files
otethalotethal
committed
[GR-21590] Update imports
PullRequest: graalpython/3936
2 parents 609d310 + 7b9de64 commit efca839

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

‎ci/graal/ci/ci_common/ci-check.libsonnet

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
local ci = import '../../ci.jsonnet';
12
local std_get = (import 'common-utils.libsonnet').std_get;
23

34
{
5+
local effective_targets(build) = std.map(function(target) if std.startsWith(target, "tier") then ci.tierConfig[target] else target, build.targets),
6+
local periodic_targets = ["daily", "weekly", "monthly", "post-merge", "opt-post-merge"],
7+
local has_periodic_target(build) = std.length(std.setInter(std.set(effective_targets(build)), std.set(periodic_targets))) != 0,
8+
49
# check that all non [gate, ondemand] entries have notify_emails or notify_groups defined
510
local missing_notify(builds) = {
6-
[x.name]: std_get(x, "defined_in") for x in builds if !std.objectHas(x, "notify_emails") && !std.objectHasAll(x, "notify_groups") && std.length(std.setInter(std.set(x.targets), std.set(["daily", "weekly", "monthly", "post-merge", "opt-post-merge"]))) != 0
11+
[x.name]: {defined_in: std_get(x, "defined_in"), targets: std_get(x, "targets")}
12+
for x in builds if !std.objectHas(x, "notify_emails") && !std.objectHasAll(x, "notify_groups") && has_periodic_target(x)
713
},
814

9-
# check that all non entries have defined_in set
15+
# check that all entries have defined_in set
1016
local missing_defined_in(builds) = {
1117
[x.name]: std_get(x, "defined_in") for x in builds if !std.objectHas(x, "defined_in")
1218
},

‎ci/graal/ci/ci_common/run-spec-impl.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
9595
else
9696
// exclusion
9797
assert std.length(excluded) == std.length(_values) : "Cannot mix inclusion with exclusion (either all entries start with '!' or none): " + _values;
98-
std.setDiff(std.objectFieldsAll(feature_map[self.feature]), excluded)
98+
std.setDiff(std.set(std.objectFieldsAll(feature_map[self.feature])), std.set(excluded))
9999
}
100100
;
101101
local is_feature_desc(key) = std.member(feature_order, get_feature_value_pair(key).feature);

‎ci/graal/common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-655", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+9-846", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -53,13 +53,13 @@
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
5555

56-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+8", "platformspecific": true, "extrabundles": ["static-libs"]},
57-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+8-jvmci-b01", "platformspecific": true },
58-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+8-jvmci-b01-debug", "platformspecific": true },
59-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+8-jvmci-b01-sulong", "platformspecific": true },
60-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+8-jvmci-b01", "platformspecific": true },
61-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+8-jvmci-b01-debug", "platformspecific": true },
62-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+8-jvmci-b01-sulong", "platformspecific": true }
56+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+9", "platformspecific": true, "extrabundles": ["static-libs"]},
57+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+9-jvmci-b01", "platformspecific": true },
58+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+9-jvmci-b01-debug", "platformspecific": true },
59+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+9-jvmci-b01-sulong", "platformspecific": true },
60+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+9-jvmci-b01", "platformspecific": true },
61+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+9-jvmci-b01-debug", "platformspecific": true },
62+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+9-jvmci-b01-sulong", "platformspecific": true }
6363
},
6464

6565
"eclipse": {

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_capi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ test.test_capi.test_list.CAPITest.test_list_setitem @ darwin-arm64,darwin-x86_64
164164
test.test_capi.test_list.CAPITest.test_list_setslice @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
165165
test.test_capi.test_list.CAPITest.test_list_size @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
166166
test.test_capi.test_list.CAPITest.test_list_sort @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
167-
test.test_capi.test_long.LongTests.test_compact @ darwin-arm64,linux-aarch64
167+
test.test_capi.test_long.LongTests.test_compact @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
168168
test.test_capi.test_long.LongTests.test_long_aslongandoverflow @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
169169
test.test_capi.test_long.LongTests.test_long_aslonglong @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
170170
test.test_capi.test_long.LongTests.test_long_aslonglongandoverflow @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "8bfc1ec4c051d3d201e92d70c6f8bcc99903405c",
56+
"version": "fd29b2e0ab7b3f341aedf9ee4dbffd2c21769592",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "8bfc1ec4c051d3d201e92d70c6f8bcc99903405c",
64+
"version": "fd29b2e0ab7b3f341aedf9ee4dbffd2c21769592",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)