aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-11-01 16:39:50 -0500
committerGitHub <noreply@github.com>2017-11-01 16:39:50 -0500
commitb001fa5e2940cdf9fa0b6fcdaefe8a56fcf98bf3 (patch)
tree7fe0bb4a04f0b0895bf866a42738273a7fee6d71 /.travis.yml
parenta235b9f9d1656b6f47d1100f2fd07130ddaf1fa1 (diff)
parent1944520627f59823ba98d5cf24f56591b622d670 (diff)
downloadrails-b001fa5e2940cdf9fa0b6fcdaefe8a56fcf98bf3.tar.gz
rails-b001fa5e2940cdf9fa0b6fcdaefe8a56fcf98bf3.tar.bz2
rails-b001fa5e2940cdf9fa0b6fcdaefe8a56fcf98bf3.zip
Merge pull request #31029 from yahonda/ignore_uninstall_bundler_at_ruby_head
Ignore "gem "bundler" cannot be uninstalled because it is a default gem" error when tested with ruby-head
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 1a3890b7d9..ffb2e33282 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ bundler_args: --without test --jobs 3 --retry 3
before_install:
- "rm ${BUNDLE_GEMFILE}.lock"
- "travis_retry gem update --system"
- - "rvm @global do gem uninstall bundler --all --ignore-dependencies --executables"
+ - "rvm @global do gem uninstall bundler --all --ignore-dependencies --executables || true"
- "travis_retry gem install bundler -v 1.15.4"
- "[ -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"