Skip to content

Commit 4b1818f

Browse files
committed
[GR-52171] Run maven_deploy_public from the /vm suite otherwise org.graalvm.polyglot:js-community is not deployed
PullRequest: truffleruby/4229
2 parents 49d0399 + 34df16b commit 4b1818f

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ def ruby_maven_deploy_public(args):
266266
licenses = ['EPL-2.0', 'PSF-License', 'GPLv2-CPE', 'ICU,GPLv2', 'BSD-simplified', 'BSD-new', 'UPL', 'MIT']
267267
mx_sdk.maven_deploy_public(args, licenses=licenses, deploy_snapshots=False)
268268

269+
def ruby_maven_deploy_public_repo_dir(args):
270+
print(mx_sdk.maven_deploy_public_repo_dir())
271+
269272
mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
270273
suite=_suite,
271274
name='TruffleRuby license files',
@@ -379,4 +382,5 @@ def ruby_maven_deploy_public(args):
379382
'verify-ci': [verify_ci, '[options]'],
380383
'ruby_jacoco_args': [ruby_jacoco_args, ''],
381384
'ruby_maven_deploy_public': [ruby_maven_deploy_public, ''],
385+
'ruby_maven_deploy_public_repo_dir': [ruby_maven_deploy_public_repo_dir, ''],
382386
})

test/truffle/ecosystem/truffleruby-polyglot-get-test.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ source test/truffle/common.sh.inc
55
# Clone Graal.js repository
66
jt mx --dy /vm,/graal-js sversions
77

8-
jt mx --env jvm-js ruby_maven_deploy_public
9-
maven_repo=$(echo "$(dirname "$(pwd)")"/graal/sdk/mxbuild/jdk*/mx.sdk/public-maven-repo)
8+
# Running that command from /vm as primary suite is needed
9+
# to deploy org.graalvm.polyglot:js-community and not just org.graalvm.js:js-community (GR-52171)
10+
pushd ../graal/vm
11+
jt mx --dy truffleruby,/graal-js ruby_maven_deploy_public
12+
maven_repo=$(jt -q mx --quiet --no-warning --dy truffleruby,/graal-js ruby_maven_deploy_public_repo_dir)
13+
popd
14+
1015
if [ ! -d "$maven_repo" ]; then
1116
echo "Maven repo not at $maven_repo ?"
1217
exit 2

0 commit comments

Comments
 (0)