Skip to content

Commit 16303cf

Browse files
committed
[GR-64087] Turn truffle-enterprise into an optional dependency.
PullRequest: truffleruby/4552
2 parents 28d6f91 + f889592 commit 16303cf

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26-3156", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26-3319", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
4545

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

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

5757
"eclipse": {

mx.truffleruby/suite.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"name": "regex",
2424
"subdir": True,
25-
"version": "38a4ec195b58325c3f7d710b3dc17d7941ae0261",
25+
"version": "aefacfb7d2d62c2254755922e85c2ee4c79530d5",
2626
"urls": [
2727
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2828
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
3131
{
3232
"name": "sulong",
3333
"subdir": True,
34-
"version": "38a4ec195b58325c3f7d710b3dc17d7941ae0261",
34+
"version": "aefacfb7d2d62c2254755922e85c2ee4c79530d5",
3535
"urls": [
3636
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3737
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -514,7 +514,7 @@
514514
"class": "LanguageLibraryProject",
515515
"dependencies": [
516516
"TRUFFLERUBY_STANDALONE_DEPENDENCIES",
517-
# LLVM_NATIVE_COMMUNITY is intentionally not used as that would include SULONG_NATIVE_RESOURCES,
517+
# LLVM_NATIVE_POM is intentionally not used as that would include SULONG_NATIVE_RESOURCES,
518518
# which would copy the resources in the image, regardless of IncludeLanguageResources,
519519
# see com.oracle.truffle.llvm.nativemode.resources.NativeResourceFeature.
520520
],
@@ -643,17 +643,17 @@
643643
"noMavenJavadoc": True,
644644
},
645645

646-
"RUBY_COMMUNITY": {
646+
"RUBY_POM": {
647647
"type": "pom",
648648
"runtimeDependencies": [
649649
"TRUFFLERUBY",
650650
"TRUFFLERUBY-RESOURCES",
651651
"truffle:TRUFFLE_RUNTIME",
652-
"sulong:LLVM_NATIVE_COMMUNITY",
652+
"sulong:LLVM_NATIVE_POM",
653653
],
654654
"description": "TruffleRuby (GraalVM Ruby)",
655655
"maven": {
656-
"artifactId": "ruby-community",
656+
"artifactId": "ruby",
657657
"tag": ["default", "public"],
658658
},
659659
"license": [

0 commit comments

Comments
 (0)