From 288fbc7ff47b6aae0d5bab978ae16858a425f643 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Fri, 3 Nov 2017 23:41:35 +0900 Subject: Revert "Merge pull request #31025 from y-yagi/follow_up_31023_part2" This reverts commit 6f481e05bb24fe3589ef0f65e97a9b1fa66ae0f7, reversing changes made to 592f790b7693c0a32cd06d5e8201639923a734c5. In favor of #31039. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ffb2e33282..e357a0ca3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ 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 || 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" -- cgit v1.2.3