Travis CI tweaks.
Attempt to improve Travis CI. This time without any vendoring gems nonsense.
This commit is contained in:
parent
0d5956948e
commit
9853a78397
@ -3,6 +3,8 @@ cache:
|
|||||||
directories:
|
directories:
|
||||||
- $HOME/.gem/ruby
|
- $HOME/.gem/ruby
|
||||||
- Library/Homebrew/vendor/bundle
|
- Library/Homebrew/vendor/bundle
|
||||||
|
# For parallel_rspec
|
||||||
|
- Library/Homebrew/tmp
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
@ -10,6 +12,7 @@ matrix:
|
|||||||
osx_image: xcode8.3
|
osx_image: xcode8.3
|
||||||
rvm: system
|
rvm: system
|
||||||
- os: linux
|
- os: linux
|
||||||
|
sudo: false
|
||||||
rvm: 2.0.0
|
rvm: 2.0.0
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
@ -49,6 +49,10 @@ module Homebrew
|
|||||||
env: OSX=10.12
|
env: OSX=10.12
|
||||||
osx_image: xcode8.3
|
osx_image: xcode8.3
|
||||||
rvm: system
|
rvm: system
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $HOME/.gem/ruby
|
||||||
|
- Library/Homebrew/vendor/bundle
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"
|
- export TRAVIS_COMMIT="$(git rev-parse --verify -q HEAD)"
|
||||||
|
@ -79,20 +79,24 @@ module Homebrew
|
|||||||
Dir.glob("test/**/*_spec.rb").reject { |p| p =~ %r{^test/vendor/bundle/} }
|
Dir.glob("test/**/*_spec.rb").reject { |p| p =~ %r{^test/vendor/bundle/} }
|
||||||
end
|
end
|
||||||
|
|
||||||
opts = []
|
opts = if ENV["CI"]
|
||||||
|
%w[
|
||||||
if ENV["CI"]
|
--combine-stderr
|
||||||
opts << "--combine-stderr"
|
--serialize-stdout
|
||||||
opts << "--serialize-stdout"
|
]
|
||||||
|
else
|
||||||
|
%w[
|
||||||
|
--nice
|
||||||
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
args = [
|
args = ["-I", HOMEBREW_LIBRARY_PATH/"test"]
|
||||||
"--color",
|
args += %w[
|
||||||
"-I", HOMEBREW_LIBRARY_PATH/"test",
|
--color
|
||||||
"--require", "spec_helper",
|
--require spec_helper
|
||||||
"--format", "progress",
|
--format progress
|
||||||
"--format", "ParallelTests::RSpec::RuntimeLogger",
|
--format ParallelTests::RSpec::RuntimeLogger
|
||||||
"--out", "tmp/parallel_runtime_rspec.log"
|
--out tmp/parallel_runtime_rspec.log
|
||||||
]
|
]
|
||||||
|
|
||||||
args << "--seed" << ARGV.next if ARGV.include? "--seed"
|
args << "--seed" << ARGV.next if ARGV.include? "--seed"
|
||||||
|
@ -656,8 +656,9 @@ class FormulaInstaller
|
|||||||
Sandbox.print_sandbox_message if Sandbox.formula?(formula)
|
Sandbox.print_sandbox_message if Sandbox.formula?(formula)
|
||||||
|
|
||||||
Utils.safe_fork do
|
Utils.safe_fork do
|
||||||
# Invalidate the current sudo timestamp in case a build script calls sudo
|
# Invalidate the current sudo timestamp in case a build script calls sudo.
|
||||||
system "/usr/bin/sudo", "-k"
|
# Travis CI's Linux sudoless workers have a weird sudo that fails here.
|
||||||
|
system "/usr/bin/sudo", "-k" unless ENV["TRAVIS_SUDO"] == "false"
|
||||||
|
|
||||||
if Sandbox.formula?(formula)
|
if Sandbox.formula?(formula)
|
||||||
sandbox = Sandbox.new
|
sandbox = Sandbox.new
|
||||||
|
@ -2,51 +2,53 @@ GEM
|
|||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
ast (2.3.0)
|
ast (2.3.0)
|
||||||
codecov (0.1.9)
|
codecov (0.1.10)
|
||||||
json
|
json
|
||||||
simplecov
|
simplecov
|
||||||
url
|
url
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.3)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
json (2.0.3)
|
json (2.1.0)
|
||||||
parallel (1.10.0)
|
parallel (1.11.2)
|
||||||
parallel_tests (2.13.0)
|
parallel_tests (2.14.1)
|
||||||
parallel
|
parallel
|
||||||
parser (2.4.0.0)
|
parser (2.4.0.0)
|
||||||
ast (~> 2.2)
|
ast (~> 2.2)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
rainbow (2.2.1)
|
rainbow (2.2.2)
|
||||||
rspec (3.5.0)
|
rake
|
||||||
rspec-core (~> 3.5.0)
|
rake (12.0.0)
|
||||||
rspec-expectations (~> 3.5.0)
|
rspec (3.6.0)
|
||||||
rspec-mocks (~> 3.5.0)
|
rspec-core (~> 3.6.0)
|
||||||
rspec-core (3.5.4)
|
rspec-expectations (~> 3.6.0)
|
||||||
rspec-support (~> 3.5.0)
|
rspec-mocks (~> 3.6.0)
|
||||||
rspec-expectations (3.5.0)
|
rspec-core (3.6.0)
|
||||||
|
rspec-support (~> 3.6.0)
|
||||||
|
rspec-expectations (3.6.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.5.0)
|
rspec-support (~> 3.6.0)
|
||||||
rspec-its (1.2.0)
|
rspec-its (1.2.0)
|
||||||
rspec-core (>= 3.0.0)
|
rspec-core (>= 3.0.0)
|
||||||
rspec-expectations (>= 3.0.0)
|
rspec-expectations (>= 3.0.0)
|
||||||
rspec-mocks (3.5.0)
|
rspec-mocks (3.6.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.5.0)
|
rspec-support (~> 3.6.0)
|
||||||
rspec-support (3.5.0)
|
rspec-support (3.6.0)
|
||||||
rspec-wait (0.0.9)
|
rspec-wait (0.0.9)
|
||||||
rspec (>= 3, < 4)
|
rspec (>= 3, < 4)
|
||||||
rubocop (0.47.1)
|
rubocop (0.48.1)
|
||||||
parser (>= 2.3.3.1, < 3.0)
|
parser (>= 2.3.3.1, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||||
ruby-progressbar (1.8.1)
|
ruby-progressbar (1.8.1)
|
||||||
simplecov (0.13.0)
|
simplecov (0.14.1)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (>= 1.8, < 3)
|
json (>= 1.8, < 3)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.0)
|
||||||
unicode-display_width (1.1.3)
|
unicode-display_width (1.2.1)
|
||||||
url (0.3.2)
|
url (0.3.2)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
@ -62,4 +64,4 @@ DEPENDENCIES
|
|||||||
simplecov
|
simplecov
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.14.5
|
1.14.6
|
||||||
|
Loading…
x
Reference in New Issue
Block a user