@@ -92,10 +92,6 @@ def docker(*args)
92
92
case arg
93
93
when *docker_distros
94
94
distro_name = arg [ 2 ..-1 ]
95
- when '--graalvm'
96
- install_method = :graalvm
97
- graalvm_tarball = args . shift
98
- graalvm_components = args . shift . split ( ':' ) . map { |path | File . expand_path ( path ) }
99
95
when '--standalone'
100
96
install_method = :standalone
101
97
standalone_tarball = args . shift
@@ -160,34 +156,7 @@ def docker(*args)
160
156
Dir . mkdir docker_dir
161
157
end
162
158
163
- check_post_install_message = [
164
- "RUN grep 'The Ruby openssl C extension needs to be recompiled on your system to work with the installed libssl' install.log" ,
165
- "RUN grep '/languages/ruby/lib/truffle/post_install_hook.sh' install.log"
166
- ]
167
-
168
159
case install_method
169
- when :graalvm
170
- FileUtils . copy graalvm_tarball , docker_dir unless print_only
171
- graalvm_tarball = File . basename ( graalvm_tarball )
172
- language_dir = graalvm_tarball . include? ( 'java11' ) ? 'languages' : 'jre/languages'
173
-
174
- lines << "COPY #{ graalvm_tarball } /test/"
175
- graalvm_base = '/test/graalvm'
176
- lines << "RUN mkdir #{ graalvm_base } "
177
- lines << "RUN tar -zxf #{ graalvm_tarball } -C #{ graalvm_base } --strip-components=1"
178
- graalvm_bin = "#{ graalvm_base } /bin"
179
-
180
- graalvm_components . each do |component |
181
- FileUtils . copy component , docker_dir unless print_only
182
- component = File . basename ( component )
183
- lines << "COPY #{ component } /test/"
184
- lines << "RUN #{ graalvm_bin } /gu install --file /test/#{ component } | tee -a install.log"
185
- end
186
- ruby_base = "#{ graalvm_base } /#{ language_dir } /ruby"
187
- ruby_bin = graalvm_bin
188
-
189
- lines . push ( *check_post_install_message )
190
- lines << "RUN #{ ruby_base } /lib/truffle/post_install_hook.sh" if run_post_install_hook
191
160
when :standalone
192
161
FileUtils . copy standalone_tarball , docker_dir unless print_only
193
162
standalone_tarball = File . basename ( standalone_tarball )
@@ -222,29 +191,23 @@ def docker(*args)
222
191
223
192
lines << "ENV PATH=#{ ruby_bin } :$PATH"
224
193
225
- configs = install_method == :graalvm ? %w[ --native --jvm ] : [ '' ]
226
-
227
- configs . each do |c |
228
- lines << "RUN ruby #{ c } --version"
229
- end
194
+ lines << 'RUN ruby --version'
230
195
231
196
if basic_test || full_test
232
- configs . each do |c |
233
- lines << "RUN cp -R #{ ruby_base } /lib/gems /test/clean-gems"
197
+ lines << "RUN cp -R #{ ruby_base } /lib/gems /test/clean-gems"
234
198
235
- gem_install = " ruby #{ c } -S gem install --no-document"
236
- lines << "RUN #{ gem_install } color"
237
- lines << "RUN ruby #{ c } -rcolor -e 'raise unless defined?(Color)'"
199
+ gem_install = ' ruby -S gem install --no-document'
200
+ lines << "RUN #{ gem_install } color"
201
+ lines << "RUN ruby -rcolor -e 'raise unless defined?(Color)'"
238
202
239
- lines << "RUN #{ gem_install } oily_png"
240
- lines << "RUN ruby #{ c } -roily_png -e 'raise unless defined?(OilyPNG::Color)'"
203
+ lines << "RUN #{ gem_install } oily_png"
204
+ lines << "RUN ruby -roily_png -e 'raise unless defined?(OilyPNG::Color)'"
241
205
242
- lines << "RUN #{ gem_install } unf"
243
- lines << "RUN ruby #{ c } -runf -e 'raise unless defined?(UNF)'"
206
+ lines << "RUN #{ gem_install } unf"
207
+ lines << "RUN ruby -runf -e 'raise unless defined?(UNF)'"
244
208
245
- lines << "RUN rm -rf #{ ruby_base } /lib/gems"
246
- lines << "RUN mv /test/clean-gems #{ ruby_base } /lib/gems"
247
- end
209
+ lines << "RUN rm -rf #{ ruby_base } /lib/gems"
210
+ lines << "RUN mv /test/clean-gems #{ ruby_base } /lib/gems"
248
211
end
249
212
250
213
if full_test
@@ -254,19 +217,14 @@ def docker(*args)
254
217
lines << "COPY --chown=test #{ file } #{ file } "
255
218
end
256
219
257
- configs . each do |c |
258
- excludes = %w[ fails slow ]
220
+ excludes = %w[ fails slow ]
259
221
260
- %w[ :command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi ] . each do |set |
261
- t_config = c . empty? ? '' : '-T' + c
262
- t_excludes = excludes . map { |e | '--excl-tag ' + e } . join ( ' ' )
263
- lines << "RUN ruby spec/mspec/bin/mspec -t #{ ruby_bin } /ruby #{ t_config } #{ t_excludes } #{ set } "
264
- end
222
+ %w[ :command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi ] . each do |set |
223
+ t_excludes = excludes . map { |e | '--excl-tag ' + e } . join ( ' ' )
224
+ lines << "RUN ruby spec/mspec/bin/mspec -t #{ ruby_bin } /ruby #{ t_excludes } #{ set } "
265
225
end
266
226
267
- configs . each do |c |
268
- lines << "RUN ruby #{ c } --experimental-options --engine.CompilationFailureAction=ExitVM --compiler.TreatPerformanceWarningsAsErrors=all --compiler.IterativePartialEscape --engine.MultiTier=false pe/pe.rb || true"
269
- end
227
+ lines << 'RUN ruby --experimental-options --engine.CompilationFailureAction=ExitVM --compiler.TreatPerformanceWarningsAsErrors=all --compiler.IterativePartialEscape --engine.MultiTier=false pe/pe.rb || true'
270
228
end
271
229
272
230
lines << 'CMD bash'
0 commit comments