Skip to content

Commit 4dddd1a

Browse files
msimacekmsimacek
committed
Update imports
1 parent 7e1bdfa commit 4dddd1a

File tree

4 files changed

+14
-30
lines changed

4 files changed

+14
-30
lines changed

‎ci/graal/ci/ci_common/common.jsonnet‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ common + common.frequencies + {
140140
linux_amd64_ubuntu: common.linux_amd64_ubuntu + graal_common_extras,
141141
linux_aarch64: common.linux_aarch64 + graal_common_extras + linux_deps_extras,
142142
linux_aarch64_ol9: common.linux_aarch64_ol9 + graal_common_extras + linux_deps_extras,
143-
darwin_amd64: common.darwin_amd64 + graal_common_extras,
144143
darwin_aarch64: common.darwin_aarch64 + graal_common_extras,
145144
windows_amd64: common.windows_amd64 + graal_common_extras,
146145
windows_server_2016_amd64: common.windows_server_2016_amd64 + graal_common_extras,

‎ci/graal/ci/common.jsonnet‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ local common_json = import "../common.json";
363363
pcre2: '==10.37',
364364
gnur: '==4.0.3-gcc4.8.5-pcre2',
365365
} + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
366-
else if (self.os == "darwin" && self.arch == "amd64") then {
367-
'pcre2': '==10.37',
368-
} else {},
366+
else {},
369367
environment+:
370368
if (self.os == "linux" && self.arch == "amd64") then {
371369
TZDIR: '/usr/share/zoneinfo',
@@ -376,25 +374,14 @@ local common_json = import "../common.json";
376374
GNUR_HOME_BINARY: '/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3',
377375
FASTR_RELEASE: 'true',
378376
}
379-
else if (self.os == "darwin" && self.arch == "amd64") then {
380-
FASTR_FC: '/cm/shared/apps/gcc/8.3.0/bin/gfortran',
381-
FASTR_CC: '/cm/shared/apps/gcc/8.3.0/bin/gcc',
382-
TZDIR: '/usr/share/zoneinfo',
383-
PKG_INCLUDE_FLAGS_OVERRIDE : '-I/cm/shared/apps/pcre2/pcre2-10.37/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include',
384-
PKG_LDFLAGS_OVERRIDE : '-L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/pcre2-10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/10.2.0/lib -L/usr/lib',
385-
FASTR_RELEASE: 'true',
386-
} else {},
377+
else {},
387378
downloads+:
388379
if (self.os == "linux" && self.arch == "amd64") then {
389380
BLAS_LAPACK_DIR: { name: 'fastr-403-blas-lapack-gcc', version: '4.8.5', platformspecific: true },
390381
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
391382
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
392383
}
393-
else if (self.os == "darwin" && self.arch == "amd64") then {
394-
BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "8.3.0", platformspecific: true },
395-
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
396-
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
397-
} else {},
384+
else {},
398385
catch_files+: if (self.os != "windows" && self.arch == "amd64") then [
399386
'GNUR_CONFIG_LOG = (?P<filename>.+\\.log)',
400387
'GNUR_MAKE_LOG = (?P<filename>.+\\.log)',
@@ -550,7 +537,6 @@ local common_json = import "../common.json";
550537

551538
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
552539

553-
darwin_amd64: darwin + amd64,
554540
darwin_aarch64: darwin + aarch64,
555541

556542
windows_amd64: windows + amd64,
@@ -581,7 +567,6 @@ local common_json = import "../common.json";
581567

582568
linux_amd64_ubuntu: self.bare.linux_amd64_ubuntu + common,
583569

584-
darwin_amd64: self.bare.darwin_amd64 + common,
585570
darwin_aarch64: self.bare.darwin_aarch64 + common,
586571

587572
windows_amd64: self.bare.windows_amd64 + common,

‎ci/graal/common.json‎

Lines changed: 9 additions & 9 deletions
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.64.0",
7+
"mx_version": "7.64.2",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -45,16 +45,16 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
48+
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
4949
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5050

51-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
52-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07", "platformspecific": true },
53-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07-debug", "platformspecific": true },
54-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07-sulong", "platformspecific": true },
55-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07", "platformspecific": true },
56-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07-debug", "platformspecific": true },
57-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07-sulong", "platformspecific": true }
51+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
52+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
53+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
54+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true },
55+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
56+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
57+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true }
5858
},
5959

6060
"eclipse": {

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

0 commit comments

Comments
 (0)