File tree 2 files changed +12
-0
lines changed
2 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -178,6 +178,7 @@ def container_registry
178
178
end
179
179
180
180
def container_rubyvm ( options = { } )
181
+ return "jruby" if options [ :platform ] == "jruby"
181
182
options . fetch ( :rubyvm ) { ENV [ 'RCD_RUBYVM' ] } || "mri"
182
183
end
183
184
Original file line number Diff line number Diff line change @@ -59,6 +59,12 @@ def test_container_image_name
59
59
Starter . container_image_name ( { :rubyvm => "jruby" } ) ,
60
60
)
61
61
62
+ # jruby platform arg
63
+ assert_equal (
64
+ "ghcr.io/rake-compiler/rake-compiler-dock-image:#{ IMAGE_VERSION } -jruby" ,
65
+ Starter . container_image_name ( { :platform => "jruby" } ) ,
66
+ )
67
+
62
68
# container registry env var
63
69
with_env ( { "CONTAINER_REGISTRY" => "registry-value" } ) do
64
70
assert_equal (
@@ -98,11 +104,16 @@ def test_container_rubyvm
98
104
with_env ( { "RCD_RUBYVM" => "env-var-value" } ) do
99
105
assert_equal ( "option-value" , Starter . container_rubyvm ( { :rubyvm => "option-value" } ) )
100
106
end
107
+
108
+ # with jruby platform option
109
+ assert_equal ( "jruby" , Starter . container_rubyvm ( { :platform => "jruby" } ) )
101
110
end
102
111
103
112
def test_container_jrubyvm?
104
113
assert ( Starter . container_jrubyvm? ( { :rubyvm => "jruby" } ) )
114
+ assert ( Starter . container_jrubyvm? ( { :platform => "jruby" } ) )
105
115
refute ( Starter . container_jrubyvm? ( { :rubyvm => "mri" } ) )
116
+ refute ( Starter . container_jrubyvm? ( { :platform => "x86_64-linux" } ) )
106
117
end
107
118
108
119
def test_platforms
You can’t perform that action at this time.
0 commit comments