Skip to content

Commit aefb5a0

Browse files
tzezulaeregon
tzezula
authored and
eregon
committed
[GR-52171] Duplicate language meta-pom into the language maven group.
PullRequest: truffleruby/4195
2 parents 3a920de + 925ae17 commit aefb5a0

File tree

3 files changed

+69
-11
lines changed

3 files changed

+69
-11
lines changed

‎ci/common.jsonnet

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,65 @@ local common_json = import "../common.json";
230230
} else {},
231231
},
232232

233+
graalpy:: {
234+
packages+: if (self.os == "linux") then {
235+
libffi: '>=3.2.1',
236+
bzip2: '>=1.0.6',
237+
maven: ">=3.3.9",
238+
} else {},
239+
},
240+
241+
fastr:: {
242+
# Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
243+
# of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)
244+
# However, we do not need to load those modules, we only configure specific environment variables to
245+
# point to these specific modules. These modules and the configuration is only necessary for installation of
246+
# some R packages (that have Fortran code) and in order to run GNU-R
247+
packages+:
248+
if (self.os == "linux" && self.arch == "amd64") then {
249+
readline: '==6.3',
250+
pcre2: '==10.37',
251+
curl: '>=7.50.1',
252+
gnur: '==4.0.3-gcc4.8.5-pcre2',
253+
}
254+
else if (self.os == "darwin" && self.arch == "amd64") then {
255+
'pcre2': '==10.37',
256+
} else {},
257+
environment+:
258+
if (self.os == "linux" && self.arch == "amd64") then {
259+
TZDIR: '/usr/share/zoneinfo',
260+
PKG_INCLUDE_FLAGS_OVERRIDE : '-I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre2/10.37/include -I/cm/shared/apps/curl/7.50.1/include',
261+
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/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64',
262+
FASTR_FC: '/cm/shared/apps/gcc/4.8.5/bin/gfortran',
263+
FASTR_CC: '/cm/shared/apps/gcc/4.8.5/bin/gcc',
264+
GNUR_HOME_BINARY: '/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3',
265+
FASTR_RELEASE: 'true',
266+
}
267+
else if (self.os == "darwin" && self.arch == "amd64") then {
268+
FASTR_FC: '/cm/shared/apps/gcc/8.3.0/bin/gfortran',
269+
FASTR_CC: '/cm/shared/apps/gcc/8.3.0/bin/gcc',
270+
TZDIR: '/usr/share/zoneinfo',
271+
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',
272+
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',
273+
FASTR_RELEASE: 'true',
274+
} else {},
275+
downloads+:
276+
if (self.os == "linux" && self.arch == "amd64") then {
277+
BLAS_LAPACK_DIR: { name: 'fastr-403-blas-lapack-gcc', version: '4.8.5', platformspecific: true },
278+
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
279+
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
280+
}
281+
else if (self.os == "darwin" && self.arch == "amd64") then {
282+
BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "8.3.0", platformspecific: true },
283+
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
284+
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
285+
} else {},
286+
catch_files+: if (self.os != "windows" && self.arch == "amd64") then [
287+
'GNUR_CONFIG_LOG = (?P<filename>.+\\.log)',
288+
'GNUR_MAKE_LOG = (?P<filename>.+\\.log)',
289+
] else [],
290+
},
291+
233292
svm:: {
234293
packages+: {
235294
cmake: "==3.22.2",

‎common.json

Lines changed: 8 additions & 8 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.13.1",
7+
"mx_version": "7.14.3",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -44,13 +44,13 @@
4444
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-debug", "platformspecific": true },
4545
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
4646

47-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+11", "platformspecific": true, "extrabundles": ["static-libs"]},
48-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+11-jvmci-b01", "platformspecific": true },
49-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+11-jvmci-b01-debug", "platformspecific": true },
50-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+11-jvmci-b01-sulong", "platformspecific": true },
51-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+11-jvmci-b01", "platformspecific": true },
52-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+11-jvmci-b01-debug", "platformspecific": true },
53-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+11-jvmci-b01-sulong", "platformspecific": true }
47+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+12", "platformspecific": true, "extrabundles": ["static-libs"]},
48+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+12-jvmci-b01", "platformspecific": true },
49+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+12-jvmci-b01-debug", "platformspecific": true },
50+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+12-jvmci-b01-sulong", "platformspecific": true },
51+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+12-jvmci-b01", "platformspecific": true },
52+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+12-jvmci-b01-debug", "platformspecific": true },
53+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+12-jvmci-b01-sulong", "platformspecific": true }
5454
},
5555

5656
"eclipse": {

‎mx.truffleruby/suite.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"name": "regex",
2222
"subdir": True,
23-
"version": "8f380d326998db82b7c6c7a354eac800ac1ca8a2",
23+
"version": "219b3c7e4c89b8229ba9af7adfa8c1f3acfddbbd",
2424
"urls": [
2525
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2626
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
2929
{
3030
"name": "sulong",
3131
"subdir": True,
32-
"version": "8f380d326998db82b7c6c7a354eac800ac1ca8a2",
32+
"version": "219b3c7e4c89b8229ba9af7adfa8c1f3acfddbbd",
3333
"urls": [
3434
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3535
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -562,7 +562,6 @@
562562
],
563563
"description": "TruffleRuby (GraalVM Ruby)",
564564
"maven": {
565-
"groupId": "org.graalvm.polyglot",
566565
"artifactId": "ruby-community",
567566
"tag": ["default", "public"],
568567
},

0 commit comments

Comments
 (0)