Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
(import "ci/python-bench.libsonnet") +
{
overlay: "28f1ff831cd38862c38c7d4c02fbf145b8a17b5c",
specVersion: "6",
specVersion: "8",
// Until buildbot issues around CI tiers are resolved, we cannot use them
// tierConfig: self.tierConfig,

Expand Down Expand Up @@ -458,7 +458,7 @@
packages: {
ruby: "==3.2.2",
libyaml: "==0.2.5",
mx: "7.34.1",
mx: "==7.82.0",
python3: "==3.8.10",
},
environment: {
Expand All @@ -477,6 +477,7 @@
["mkdir", "-p", "../docs/site/vendor/cache"],
["cp", "graal-languages-jekyll-theme-*.gem", "../docs/site/vendor/cache"],
["cd", "../docs/site"],
["bundle", "config", "set", "local.graal-languages-jekyll-theme", "../../graal-languages-jekyll-theme"],
["bundle", "config", "set", "mirror.https://rubygems.org", $.overlay_imports.RUBYGEMS_MIRROR],
["bundle", "install"],
["bundle", "exec", "jekyll", "build"],
Expand Down Expand Up @@ -508,7 +509,7 @@
targets: ["deploy"],
capabilities: ["linux", "amd64"],
packages: {
mx: "7.34.1",
mx: "==7.82.0",
python3: "==3.8.10",
},
requireArtifacts: [
Expand Down
12 changes: 4 additions & 8 deletions ci/python-bench.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
local run_spec = import "graal/ci/ci_common/run-spec.libsonnet",
local tools = import "graal/ci/ci_common/run-spec-tools.libsonnet",
local const = import "constants.libsonnet",
local utils = import "utils.libsonnet",
local reports = $.overlay_imports.reports,

local exclude = run_spec.exclude,
Expand Down Expand Up @@ -95,15 +96,10 @@
PIP_EXTRA_INDEX_URL: $.overlay_imports.PIP_EXTRA_INDEX_URL,
} else {},

local pip_index_setup = [
// Use the CI Python's configured base index and overlay-provided GraalPy wheel index.
["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]],
] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [
["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL],
] else [],
local pip_index_setup = utils.pip_index_setup($.overlay_imports.PIP_EXTRA_INDEX_URL),

local packages(os, arch) = self.packages(os, arch) + {
make: ">=3.83",
make: "==4.3",
binutils: "==2.23.2",
},

Expand Down Expand Up @@ -254,7 +250,7 @@
],
deploysArtifacts: true,
packages +: packages(self.os, self.arch) + {
"apache/ant": ">=1.9.4",
"apache/ant": "==1.10.1",
libyaml: "==0.2.5",
"pip:ninja_syntax": "==1.7.2",
"pip:pylint": "==2.4.4",
Expand Down
29 changes: 13 additions & 16 deletions ci/python-gate.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,7 @@
buildslave_ol8: ENVIRONMENT_DIFF_OL8,
},

local pip_index_setup = [
// Use the CI Python's configured base index and overlay-provided GraalPy wheel index.
["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]],
] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [
["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL],
] else [],
local pip_index_setup = utils.pip_index_setup($.overlay_imports.PIP_EXTRA_INDEX_URL),

//------------------------------------------------------------------------------------------------------------------
// packages
Expand All @@ -209,30 +204,32 @@
linux: {
common: {
"00:devtoolset": "==7",
"01:binutils": ">=2.34",
bzip2: ">=1.0.6",
cmake: ">=3.22.2",
zlib: ">=1.2.11",
lcov: ">=1.11",
libffi: ">=3.2.1",
"01:binutils": "==2.34",
bzip2: "==1.0.6",
cmake: "==3.22.2",
zlib: "==1.2.11",
lcov: "==1.14",
libffi: "==3.2.1",
llvm: "==8.0.0",
maven: ">=3.3.9",
maven: "==3.9.10",
curl: '==7.50.1',
},
amd64: {},
aarch64: {},
aarch64: {
maven: "==3.5.3",
},
},
darwin: {
common: {
coreutils: "",
maven: ">=3.3.9",
maven: "==3.3.9",
},
amd64: {},
aarch64: {},
},
windows: {
common: {
maven: ">=3.3.9",
maven: "==3.3.9",
},
amd64: {},
aarch64: {},
Expand Down
18 changes: 18 additions & 0 deletions ci/utils.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,24 @@ local common = import "graal/ci/common.jsonnet";
else
newPath,

pip_index_setup(extra_index_url)::
local pip_index_from_config_or_env = [
"python",
"-c",
"import os, subprocess, sys; " +
"cmd = [sys.executable, '-m', 'pip', 'config', 'get', 'global.index-url']; " +
"p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True); " +
"print(p.stdout.strip() if p.returncode == 0 else os.environ.get('PIP_INDEX_URL') or " +
"os.environ.get('PIP_EXTRA_INDEX_URL', ''))",
];
(if extra_index_url != "" then [
["set-export", "PIP_EXTRA_INDEX_URL", extra_index_url],
] else []) + [
// Use the CI Python's configured base index if present. pip config get does not report env
// vars, so preserve Buildbot's PIP_INDEX_URL before falling back to the overlay repository URL.
["set-export", "PIP_INDEX_URL", pip_index_from_config_or_env],
],

ensure_notify(builds):: [
b + (
if !std.objectHas(b, "notify_groups") && std.objectHas(b, "targets") && (b.targets == ["gate"] || b.targets == ["post-merge"]) then
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test.test_codecmaps_cn.TestGB18030Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGB18030Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGBKMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGBKMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_cn.TestGB18030Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGB18030Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGB2312Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGBKMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_cn.TestGBKMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
test.test_codecmaps_hk.TestBig5HKSCSMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_hk.TestBig5HKSCSMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
test.test_codecmaps_jp.TestCP932Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJISX0213Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJISX0213Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestSJISCOMPATMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestSJISCOMPATMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestSJISX0213Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestSJISX0213Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_jp.TestCP932Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJISX0213Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJISX0213Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestSJISCOMPATMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestSJISCOMPATMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestSJISX0213Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_jp.TestSJISX0213Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
test.test_codecmaps_kr.TestCP949Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestCP949Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestCP949Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_kr.TestCP949Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestCP949Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestCP949Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestEUCKRMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_kr.TestJOHABMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
test.test_codecmaps_tw.TestBIG5Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_tw.TestBIG5Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_tw.TestCP950Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_codecmaps_tw.TestBIG5Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_tw.TestBIG5Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_tw.TestCP950Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ test.test_hashlib.HashLibTestCase.test_case_sha384_1 @ darwin-arm64,linux-aarch6
test.test_hashlib.HashLibTestCase.test_case_sha384_2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha384_3 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_224_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_256_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_384_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_512_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha512_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha512_1 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_hashlib.HashLibTestCase.test_case_sha512_2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
Expand Down
Loading
Loading