Skip to content

Commit 2007f9a

Browse files
committed
[GR-47568] Added TruffleRuby community meta-POM.
PullRequest: truffleruby/3936
2 parents c21b2e1 + 12d4032 commit 2007f9a

File tree

3 files changed

+89
-20
lines changed

3 files changed

+89
-20
lines changed

ci/common.jsonnet

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,13 @@ local common_json = import "../common.json";
121121

122122
graalnodejs:: {
123123
packages+: if self.os == "linux" then {
124-
"00:devtoolset": "==11",
125124
cmake: "==3.22.2",
126-
} else {},
125+
} + (if self.arch == "aarch64" then {
126+
"00:devtoolset": "==10",
127+
} else {
128+
"00:devtoolset": "==11",
129+
})
130+
else {},
127131
},
128132

129133
svm:: {
@@ -141,9 +145,13 @@ local common_json = import "../common.json";
141145
"*.log",
142146
],
143147

144-
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
145-
"00:devtoolset": "==11",
146-
} else {},
148+
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then
149+
(if self.arch == "aarch64" then {
150+
"00:devtoolset": "==10",
151+
} else {
152+
"00:devtoolset": "==11",
153+
})
154+
else {},
147155
},
148156
},
149157

@@ -236,11 +244,17 @@ local common_json = import "../common.json";
236244
mount_modules: true,
237245
},
238246
},
247+
local ol9 = {
248+
docker+: {
249+
image: "buildslave_ol9",
250+
mount_modules: true,
251+
},
252+
},
239253
local ubuntu22 = {
240-
docker: {
241-
image: "buildslave_ubuntu22",
242-
mount_modules: true,
243-
},
254+
docker+: {
255+
image: "buildslave_ubuntu22",
256+
mount_modules: true,
257+
},
244258
},
245259
local deps_linux = {
246260
},
@@ -256,17 +270,21 @@ local common_json = import "../common.json";
256270

257271
local amd64 = { arch:: "amd64", capabilities+: [self.arch] },
258272
local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
273+
local ol_distro = {os_distro:: "ol"},
259274

260-
linux_amd64: linux + amd64 + ol7,
261-
linux_amd64_ubuntu: linux + amd64 + ubuntu22,
262-
linux_aarch64: linux + aarch64,
275+
linux_amd64: linux + amd64 + ol7 + ol_distro,
276+
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + {os_distro:: "ubuntu"},
277+
linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
278+
linux_aarch64: linux + aarch64 + ol_distro,
279+
linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
263280

264281
darwin_amd64: darwin + amd64,
265282
darwin_aarch64: darwin + aarch64,
266283

267284
windows_amd64: windows + amd64,
268285
windows_server_2016_amd64: windows_server_2016 + amd64,
269286

287+
270288
# Utils
271289
disable_proxies: {
272290
setup+: [

common.json

Lines changed: 1 addition & 1 deletion
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": "6.35.1",
7+
"mx_version": "6.38.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

mx.truffleruby/suite.py

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
suite = {
2-
"mxversion": "6.27.6",
2+
"mxversion": "6.37.0",
33
"name": "truffleruby",
4+
"groupId": "org.graalvm.ruby",
5+
"url": "https://www.graalvm.org/ruby/",
6+
"developer": {
7+
"name": "GraalVM Development",
8+
"email": "graalvm-dev@oss.oracle.com",
9+
"organization": "Oracle Corporation",
10+
"organizationUrl": "http://www.graalvm.org/",
11+
},
12+
"scm": {
13+
"url": "https://github.com/oracle/truffleruby",
14+
"read": "https://github.com/oracle/truffleruby.git",
15+
"write": "git@github.com:oracle/truffleruby.git",
16+
},
417

518
"imports": {
619
"suites": [
720
{
821
"name": "regex",
922
"subdir": True,
10-
"version": "f0f46b2161b7d1538f8f5b0f7cd188b5a2cf3f49",
23+
"version": "9f016aa100ac1fd33360331574b06cae5583ef2c",
1124
"urls": [
1225
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1326
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +29,7 @@
1629
{
1730
"name": "sulong",
1831
"subdir": True,
19-
"version": "f0f46b2161b7d1538f8f5b0f7cd188b5a2cf3f49",
32+
"version": "9f016aa100ac1fd33360331574b06cae5583ef2c",
2033
"urls": [
2134
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2235
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -396,7 +409,11 @@
396409
"org.truffleruby.annotations"
397410
],
398411
"description": "TruffleRuby Annotations",
399-
"license": ["EPL-2.0"]
412+
"license": ["EPL-2.0"],
413+
"maven": {
414+
"artifactId": "ruby-annotations",
415+
},
416+
"noMavenJavadoc": True,
400417
},
401418

402419
# Required to share code between the launcher and the rest,
@@ -418,7 +435,11 @@
418435
"sdk:GRAAL_SDK",
419436
],
420437
"description": "TruffleRuby Shared constants and predicates",
421-
"license": ["EPL-2.0"]
438+
"license": ["EPL-2.0"],
439+
"maven": {
440+
"artifactId": "ruby-shared",
441+
},
442+
"noMavenJavadoc": True,
422443
},
423444

424445
"TRUFFLERUBY-PROCESSOR": {
@@ -431,6 +452,7 @@
431452
],
432453
"description": "TruffleRuby Annotation Processor",
433454
"license": ["EPL-2.0"],
455+
"maven": False,
434456
},
435457

436458
"TRUFFLERUBY-SERVICES": {
@@ -447,7 +469,8 @@
447469
"sdk:GRAAL_SDK",
448470
],
449471
"description": "TruffleRuby services",
450-
"license": ["EPL-2.0"]
472+
"license": ["EPL-2.0"],
473+
"maven": False,
451474
},
452475

453476
"TRUFFLERUBY": {
@@ -472,7 +495,29 @@
472495
"truffleruby:JCODINGS",
473496
"truffleruby:JONI",
474497
],
475-
"description": "TruffleRuby",
498+
"description": "Core module of Ruby on Truffle",
499+
"license": [
500+
"EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
501+
"BSD-new", # Rubinius
502+
"BSD-simplified", # MRI
503+
"MIT", # Joni, JCodings
504+
],
505+
"maven": {
506+
"artifactId": "ruby-language",
507+
},
508+
"noMavenJavadoc": True,
509+
},
510+
511+
"TRUFFLERUBY_COMMUNITY": {
512+
"type": "pom",
513+
"runtimeDependencies": [
514+
"TRUFFLERUBY",
515+
"truffle:TRUFFLE_RUNTIME",
516+
],
517+
"description": "TruffleRuby (GraalVM Ruby)",
518+
"maven": {
519+
"artifactId": "ruby-community",
520+
},
476521
"license": [
477522
"EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
478523
"BSD-new", # Rubinius
@@ -488,6 +533,7 @@
488533
},
489534
"description": "TruffleRuby Bootstrap Launcher to build core C extensions",
490535
"license": ["EPL-2.0"],
536+
"maven": False,
491537
},
492538

493539
"TRUFFLERUBY-LAUNCHER": {
@@ -508,6 +554,7 @@
508554
],
509555
"description": "TruffleRuby Launcher",
510556
"license": ["EPL-2.0"],
557+
"maven": False,
511558
},
512559

513560
"TRUFFLERUBY_GRAALVM_SUPPORT": {
@@ -570,6 +617,7 @@
570617
"BSD-simplified", # MRI
571618
"BSD-new", # Rubinius, FFI
572619
],
620+
"maven": False,
573621
},
574622

575623
"TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES": {
@@ -608,6 +656,7 @@
608656
"file:src/main/c/psych/psych*.h",
609657
],
610658
},
659+
"maven": False,
611660
},
612661

613662
"TRUFFLERUBY_GRAALVM_LICENSES": {
@@ -640,6 +689,7 @@
640689
"org.graalvm.language.ruby.home": "<path:TRUFFLERUBY_GRAALVM_SUPPORT>"
641690
},
642691
"license": ["EPL-2.0"],
692+
"maven": False,
643693
},
644694

645695
"TRUFFLERUBY-TCK": {
@@ -650,6 +700,7 @@
650700
"org.graalvm.language.ruby.home": "<path:TRUFFLERUBY_GRAALVM_SUPPORT>"
651701
},
652702
"license": ["EPL-2.0"],
703+
"maven": False,
653704
},
654705
},
655706
}

0 commit comments

Comments
 (0)