Fix 4.2-stable build - Cherry pick "use correct Gemfile in bin/setup test"
#26592
Conversation
Currently, `bin/setup` test uses Gemfile of Rails. But this Gemfile is not a file to be used in Rails application. Add a Gemfile to Rails application that is created for test, it has been modified to use the Gemfile.
|
|
prathamesh-sonpatki
force-pushed
the
fix-4-2-stable-build
branch
4 times, most recently
from
aaecfed
to
121f82b
Compare
…version` for pg gem - pg gem has dropped support for Ruby 1.9 in version 0.19 and above. - Recent version of bundler respect the `required_ruby_version` setting in the gemspec. - But we had bundler 1.7.6 for Ruby 1.9 in Travis. - So we update bundler if we are running build for Ruby 1.9.
prathamesh-sonpatki
force-pushed
the
fix-4-2-stable-build
branch
from
121f82b
to
4a80b99
Compare
|
Now railties tests are fixed but queue_classic tests are failing. Working on them. |
prathamesh-sonpatki
force-pushed
the
fix-4-2-stable-build
branch
from
ef12163
to
1e9a58a
Compare
… 1.9, 2.0 and 2.1 as well - Based on the failures in https://travis-ci.org/rails/rails/jobs/163622079 and https://travis-ci.org/rails/rails/jobs/163622078, it looks like Bundler is installing wrong version of queue_classic gem to 0.3.0 when the dependency is set to 3.1.0. So trying to see if upgrading the bundler fixes this issue or not.
prathamesh-sonpatki
force-pushed
the
fix-4-2-stable-build
branch
from
1e9a58a
to
844385b
Compare
|
r? @matthewd As per your suggestion, updated bundler for 1.9.3 but faced issues with random behavior in builds for 2.0 and 2.1 as well for queue_classic gem like https://travis-ci.org/rails/rails/jobs/163622079#L294 and https://travis-ci.org/rails/rails/jobs/163622078#L294 So I tried updating bundler version of these two versions as well and it worked. |
|
Oh, the gem update is way faster than I was expecting. Let's just do it on all the versions, then. 👍🏻 I was worried it'd add something like 30 seconds per job. At this speed, maybe we should just apply this across the board on the current branches too. |
- The time it takes to install is not much so as per @matthewd's feedback, updated to use updated version of bundler for all Ruby versions.
|
@matthewd Done. Will send PR for current branches later. |
- We were running into issues with old bundler versions on 4.2 builds. So we bumped the bundler version on 4-2-stable branch in rails#26592. - This commit applies same change to master as per discussion in rails#26592 (comment).
|
@guilleiguaran I see your merge commit in this PR. Did you add it because it was not merging cleanly with 4-2-stable? |
|
@prathamesh-sonpatki yes, github said that the branch weren't updated with 4-2-stable |
|
Thanks 😄 |
|
thank you!!! |
Summary
Currently,
bin/setuptest uses Gemfile of Rails. But this Gemfile is not afile to be used in Rails application.
Add a Gemfile to Rails application that is created for test, it has been
modified to use the Gemfile.