Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relax bundler version in 5-1-stable #31565

Merged
merged 2 commits into from
Dec 26, 2017
Merged

Relax bundler version in 5-1-stable #31565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0d91a
Revert "Revert "Merge pull request #31543 from hsbt/update-bundler-1-…
y-yagi Dec 25, 2017
6e26c2d
Bump ruby versions
y-yagi Dec 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bundler_args: --without test --jobs 3 --retry 3
before_install:
- "rm ${BUNDLE_GEMFILE}.lock"
- "gem update --system"
- "gem install bundler -v 1.15.4"
- "gem install bundler"
- "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)"
- "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd"
- "[[ $GEM != 'av:ujs' ]] || nvm install node"
Expand Down Expand Up @@ -52,28 +52,28 @@ env:
- "GEM=ac:integration"

rvm:
- 2.2.7
- 2.3.4
- 2.4.1
- 2.2.8
- 2.3.5
- 2.4.2
- ruby-head

matrix:
include:
- rvm: 2.4.1
- rvm: 2.4.2
env: "GEM=av:ujs"
- rvm: 2.2.7
- rvm: 2.2.8
env: "GEM=aj:integration"
services:
- memcached
- redis
- rabbitmq
- rvm: 2.3.4
- rvm: 2.3.5
env: "GEM=aj:integration"
services:
- memcached
- redis
- rabbitmq
- rvm: 2.4.1
- rvm: 2.4.2
env: "GEM=aj:integration"
services:
- memcached
Expand All @@ -85,15 +85,15 @@ matrix:
- memcached
- redis
- rabbitmq
- rvm: 2.3.4
- rvm: 2.3.5
env:
- "GEM=ar:mysql2 MYSQL=mariadb"
addons:
mariadb: 10.2
- rvm: 2.3.4
- rvm: 2.3.5
env:
- "GEM=ar:sqlite3_mem"
- rvm: 2.3.4
- rvm: 2.3.5
env:
- "GEM=ar:postgresql POSTGRES=9.2"
addons:
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/action_controller_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/active_job_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/active_record_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/active_record_migrations_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/benchmark.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down
2 changes: 0 additions & 2 deletions guides/bug_report_templates/generic_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
gem "bundler", "< 1.16"

begin
require "bundler/inline"
rescue LoadError => e
Expand Down