admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3424 from MikeMcQuaid/services_spec_leak

Browse Source 
spec_helper: fix etc leak.
This commit is contained in:
Mike McQuaid 2017-11-05 14:44:17 +00:00 committed by GitHub
commit c3006f0f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,4 +1,5 @@
language: ruby language: ruby
rvm: system
cache: cache:
directories: directories:
- $HOME/.gem/ruby - $HOME/.gem/ruby
@ -12,14 +13,13 @@ matrix:
include: include:
- os: osx - os: osx
osx_image: xcode9 osx_image: xcode9
rvm: system
- os: linux - os: linux
sudo: false sudo: false
rvm: 2.3.3
before_install: before_install:
- export HOMEBREW_NO_AUTO_UPDATE=1 - export HOMEBREW_NO_AUTO_UPDATE=1
- export HOMEBREW_DEVELOPER=1 - export HOMEBREW_DEVELOPER=1
- export HOMEBREW_FORCE_VENDOR_RUBY=1
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
HOMEBREW_REPOSITORY="$(brew --repo)"; HOMEBREW_REPOSITORY="$(brew --repo)";
sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps";

1
Library/Homebrew/test/spec_helper.rb
View File

@ -117,6 +117,7 @@ RSpec.configure do |config|
HOMEBREW_PINNED_KEGS, HOMEBREW_PINNED_KEGS,
HOMEBREW_PREFIX/".git", HOMEBREW_PREFIX/".git",
HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"bin",
HOMEBREW_PREFIX/"etc",
HOMEBREW_PREFIX/"share", HOMEBREW_PREFIX/"share",
HOMEBREW_PREFIX/"opt", HOMEBREW_PREFIX/"opt",
HOMEBREW_PREFIX/"Caskroom", HOMEBREW_PREFIX/"Caskroom",