Skip to content

fix: include the toolchain interpreter in rb_gem_push runfiles #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
titusfortner wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

fix: include the toolchain interpreter in rb_gem_push runfiles #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jobs:
- run: bazel run "@ruby//:gem" "--" info
- run: bazel run "@bundle//bin:rake" "--" --version
- run: bazel run "@bundle//bin:rspec" "--" --help
- run: bazel run :gem-release "--" --help
- run: bazel test ...
- name: Run coverage
if: matrix.os != 'windows-latest'
Expand Down
11 changes: 8 additions & 3 deletions ruby/private/gem_push.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@ def _rb_gem_push_impl(ctx):
if ctx.attr.ruby != None:
ruby_toolchain = ctx.attr.ruby[platform_common.ToolchainInfo]
srcs = [ctx.file.gem]
tools = [ruby_toolchain.gem]
tools = list(ruby_toolchain.files)
java_bin = ""

if ruby_toolchain.version.startswith("jruby"):
env["JAVA_HOME"] = java_toolchain.java_runtime.java_home
tools.extend(java_toolchain.java_runtime.files.to_list())
java_bin = java_toolchain.java_runtime.java_executable_runfiles_path[3:]

env.update(ruby_toolchain.env)
env.update(ctx.attr.env)

script = generate_rb_binary_script(
ctx,
binary = ruby_toolchain.gem,
bundler = False,
args = ["push", ctx.file.gem.short_path],
env = env,
java_bin = java_bin,
)

runfiles = ctx.runfiles(srcs + tools)
runfiles = runfiles.merge(ctx.attr._runfiles_library[DefaultInfo].default_runfiles)
env.update(ctx.attr.env)

return [
DefaultInfo(
Expand Down
Loading