Skip to content

Commit 824733a

Browse files
committed
[GR-21590] Import update.
PullRequest: graalpython/4677
2 parents baecb8c + 3173357 commit 824733a

4 files changed

Lines changed: 13 additions & 12 deletions

File tree

ci.jsonnet

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,15 +310,15 @@
310310
"tox-example": gpgate_ee + require(GPYEE_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
311311
"linux:amd64:jdk-latest" : tier3,
312312
}),
313-
"python-svm-graalos-standalone-build": gpgate_ee + internet_access_env + platform_spec(no_jobs) + platform_spec({
314-
"linux:amd64:jdk-latest": tier3 + $.ol8 + task_spec({
315-
environment +: {
316-
GRAALPY_GRAALOS_TOOLCHAIN_URL: $.overlay_imports.GRAALPY_GRAALOS_TOOLCHAIN_URL,
317-
GRAALPY_GRAALOS_RUNTIME_URL: $.overlay_imports.GRAALPY_GRAALOS_RUNTIME_URL,
318-
GRAALPY_GRAALOS_ARTIFACT_BASE_URL: $.overlay_imports.GRAALPY_GRAALOS_ARTIFACT_BASE_URL,
319-
},
320-
}),
321-
}),
313+
// "python-svm-graalos-standalone-build": gpgate_ee + internet_access_env + platform_spec(no_jobs) + platform_spec({
314+
// "linux:amd64:jdk-latest": tier3 + $.ol8 + task_spec({
315+
// environment +: {
316+
// GRAALPY_GRAALOS_TOOLCHAIN_URL: $.overlay_imports.GRAALPY_GRAALOS_TOOLCHAIN_URL,
317+
// GRAALPY_GRAALOS_RUNTIME_URL: $.overlay_imports.GRAALPY_GRAALOS_RUNTIME_URL,
318+
// GRAALPY_GRAALOS_ARTIFACT_BASE_URL: $.overlay_imports.GRAALPY_GRAALOS_ARTIFACT_BASE_URL,
319+
// },
320+
// }),
321+
// }),
322322
},
323323

324324
local need_pgo = task_spec({runAfter: ["python-pgo-profile-post_merge-linux-amd64-jdk-latest"]}),

ci/graal/ci/ci_common/common.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ common + common.frequencies + {
136136
},
137137

138138
linux_amd64: common.linux_amd64 + graal_common_extras + linux_deps_extras,
139+
linux_amd64_ol8: common.linux_amd64_ol8 + graal_common_extras + linux_deps_extras,
139140
linux_amd64_ol9: common.linux_amd64_ol9 + graal_common_extras + linux_deps_extras,
140141
linux_amd64_ubuntu: common.linux_amd64_ubuntu + graal_common_extras,
141142
linux_aarch64: common.linux_aarch64 + graal_common_extras + linux_deps_extras,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test.test_mmap.MmapTests.test_double_close @ darwin-arm64,linux-aarch64,linux-aa
99
test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
1010
test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
1111
test.test_mmap.MmapTests.test_extended_set_del_slice @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
12-
test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
12+
test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64
1313
test.test_mmap.MmapTests.test_find_end @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
1414
test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,win32-AMD64,win32-AMD64-github
1515
test.test_mmap.MmapTests.test_length_0_large_offset @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64-github

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": "2143cd9f4e3c06b5518d1cbd23c09a918bc9cb58",
56+
"version": "4e3166d0bbb8092e1c39a117acfb9e2ebf0db7ef",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "2143cd9f4e3c06b5518d1cbd23c09a918bc9cb58",
64+
"version": "4e3166d0bbb8092e1c39a117acfb9e2ebf0db7ef",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)