Skip to content

Commit 2242f79

Browse files
committed
Update Bundler version and update test to avoid hardcoding it
1 parent a80256d commit 2242f79

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

doc/contributor/updating-ruby.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ In a separate commit, update all of these:
149149
* Update `doc/legal/legal.md`
150150
* Update method lists - see `spec/truffle/methods_spec.rb`
151151
* Run `jt test gems default-bundled-gems`
152-
* Grep for the old version with `git grep -F x.y.z`
152+
* Grep for the old Ruby version with `git grep -F x.y.z`
153+
* Grep for the old Bundler version with `git grep -F x.y.z`
153154
* If `tool/id.def` or `lib/cext/include/truffleruby/internal/id.h` has changed, `jt build core-symbols` and check for correctness.
154155

155156
For a new major version:

test/truffle/ecosystem/blog6/Gemfile.lock.renamed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,4 @@ RUBY VERSION
169169
ruby 2.4.4p0 (truffleruby 0.0-c3a45cc6)
170170

171171
BUNDLED WITH
172-
2.2.22
172+
2.2.32

test/truffle/integration/bundler-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GEM_HOME=$PWD/temp-gem-home jt ruby -S gem install --local "$gem_test_pack/gem-c
1111

1212
output=$(GEM_HOME=$PWD/temp-gem-home jt ruby -Ctest/truffle/integration/bundler-version/one bundler-version.rb)
1313

14-
if [ "$output" = '"1.17.3"' ]; then
14+
if [ "$output" = 'true' ]; then
1515
echo Success
1616
else
1717
echo Unexpected bundler 1 output
@@ -21,7 +21,7 @@ fi
2121

2222
output=$(GEM_HOME=$PWD/temp-gem-home jt ruby -Ctest/truffle/integration/bundler-version/two bundler-version.rb)
2323

24-
if [ "$output" = '"2.2.22"' ]; then
24+
if [ "$output" = 'true' ]; then
2525
echo Success
2626
else
2727
echo Unexpected bundler 2 output
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
require 'bundler/setup'
2-
p Bundler::VERSION
2+
p Bundler::VERSION == "1.17.3"

test/truffle/integration/bundler-version/two/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ PLATFORMS
88
DEPENDENCIES
99

1010
BUNDLED WITH
11-
2.2.22
11+
2.2.32
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
require 'bundler/setup'
2-
p Bundler::VERSION
2+
3+
require 'json'
4+
versions = File.expand_path('../../../../../versions.json', __dir__)
5+
expected = JSON.load(File.read(versions)).dig('gems', 'default', 'bundler')
6+
7+
p Bundler::VERSION == expected

0 commit comments

Comments
 (0)