diff options
| author | Mike McQuaid | 2017-05-07 17:28:34 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-05-07 17:28:34 +0100 |
| commit | a76392dd5f7f603e83be7bc1b6df103d731d1bf4 (patch) | |
| tree | 1f2f4ad3d7376208bf280486474e62293c43f204 | |
| parent | 8d948e4b0b55912c592d34cb5ea83c649b1f9d5e (diff) | |
| download | brew-a76392dd5f7f603e83be7bc1b6df103d731d1bf4.tar.bz2 | |
Revert "Merge pull request #2602 from MikeMcQuaid/travis-ci-tweaks"
This reverts commit 8d948e4b0b55912c592d34cb5ea83c649b1f9d5e, reversing
changes made to 2372872974d1049c2beafe7dedb7f8f882502058.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Library/Homebrew/dev-cmd/tap-new.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index dbf56e6b1..f268e40ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,9 @@ matrix: osx_image: xcode8.3 rvm: system - os: linux - sudo: false rvm: 2.0.0 before_install: - - rm -rf Library/Homebrew/vendor/bundle/ - export GEM_HOME="$PWD/Library/Homebrew/vendor/ruby/2.0.0" - gem list --installed bundler || gem install bundler - export PATH="$GEM_HOME/bin:$PATH" diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb index 0dbb5476d..48449e98d 100644 --- a/Library/Homebrew/dev-cmd/tap-new.rb +++ b/Library/Homebrew/dev-cmd/tap-new.rb @@ -46,10 +46,9 @@ module Homebrew travis = <<-EOS.undent language: ruby os: osx + env: OSX=10.12 osx_image: xcode8.3 rvm: system - cache: - directories: /usr/local/Homebrew/Library/Homebrew/vendor before_install: - export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)" |