diff options
| author | Mike McQuaid | 2016-12-04 15:13:24 +0000 |
|---|---|---|
| committer | GitHub | 2016-12-04 15:13:24 +0000 |
| commit | 88d0e8c2e6c02d07111d99250e24f2bc201c8444 (patch) | |
| tree | 841db6e23bde13df543a7640b370a3f8dc7dc337 | |
| parent | a6a09d6c5e85b5aea695dac0c88ea1cb8819f39e (diff) | |
| parent | dc8189833165ce263ce323a1c8de5dfd44597e3b (diff) | |
| download | brew-88d0e8c2e6c02d07111d99250e24f2bc201c8444.tar.bz2 | |
Merge pull request #1612 from MikeMcQuaid/travis-xcode-8.1
travis: use Xcode 8.1 on Sierra.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | Library/Homebrew/cask/cmd/brew-cask-tests.rb | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 1cc076b3c..dda1644cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: ruby matrix: include: - os: osx - osx_image: xcode8.0 + osx_image: xcode8.1 rvm: system - os: linux rvm: 2.0.0 @@ -13,7 +13,7 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then HOMEBREW_REPOSITORY="$(brew --repo)"; sudo rm -rf "$HOMEBREW_REPOSITORY"; - ln -s "$PWD" "$HOMEBREW_REPOSITORY"; + sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; else export PATH="$PWD/bin:$PATH"; umask 022; diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb index 0bfc4b037..43683a263 100755 --- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb +++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb @@ -24,7 +24,11 @@ repo_root.cd do rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest") minitest = ARGV.flag?("--minitest") || !ARGV.flag?("--rspec") - ENV["HOMEBREW_TESTS_COVERAGE"] = "1" if ARGV.flag?("--coverage") + p [:coverage, ARGV.flag?("--coverage"), ENV["CI"], ENV["TRAVIS"]] + if ARGV.flag?("--coverage") + ENV["HOMEBREW_TESTS_COVERAGE"] = "1" + upload_coverage = ENV["CODECOV_TOKEN"] || ENV["TRAVIS"] + end failed = false @@ -46,7 +50,8 @@ repo_root.cd do Homebrew.failed = failed - if ENV["CODECOV_TOKEN"] + if upload_coverage + puts "Submitting Codecov coverage..." system "bundle", "exec", "rake", "test:coverage:upload" end end |