[GR-45043] Improvements for the import prism script

PullRequest: truffleruby/4479
oracle · Feb 18, 2025 · aaff490 · aaff490
2 parents be122da + acb297e
commit aaff490
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/test/truffle/gems/default-bundled-gems.sh b/test/truffle/gems/default-bundled-gems.sh
@@ -16,9 +16,9 @@ cat Gemfile
 # This test only works with no bundle path set
 bundle config set --local path.system true
 
-bundle lock
+jt ruby -S bundle lock --local
 
-# There is a bug in RubyGems/bundler version vendored in Ruby 3.5 so
+# There is a bug in RubyGems/bundler version vendored in Ruby 3.3.5 so
 # `bundle install` command ignores the `--local` option and still downloads gems (default ones as well).
 # See https://github.com/rubygems/rubygems/issues/8179
 # TODO: uncomment this line and regenerate Gemfile.lock with the next updating MRI that have the bug fixed.

diff --git a/tool/import-prism.sh b/tool/import-prism.sh
@@ -52,6 +52,8 @@ gem spec prism.gem --ruby > prism.generated.gemspec
 VERSION=$(ruby -e 'puts File.read("prism.generated.gemspec")[/stub: prism ([\d\.]+)/, 1]')
 popd
 
+rm lib/gems/specifications/default/prism-*.gemspec # remove a gemspec of the previous version
+
 cp $PRISM/prism.generated.gemspec "lib/gems/specifications/default/prism-$VERSION.gemspec"
 rm $PRISM/prism.generated.gemspec
 rm $PRISM/prism.gem