diff options
| author | Dominyk Tiller | 2016-01-12 00:02:14 +0000 |
|---|---|---|
| committer | Dominyk Tiller | 2016-01-12 22:16:59 +0000 |
| commit | cbcfbacf22400f3d625cbf04369cd1ef137dc6dd (patch) | |
| tree | 5d450acf44234adda605641aabf38d23385a11b3 /Library/Homebrew/cmd | |
| parent | e75e717ebbc116f84bd2a072fbc0deafed06aba9 (diff) | |
| download | brew-cbcfbacf22400f3d625cbf04369cd1ef137dc6dd.tar.bz2 | |
test-bot: restore no-bottle support
This feature is still quite useful, particularly because of the somewhat
buggy behaviour of `default_formula` which means when attempting to build
a bottle it'll attempt to force the installation of that formula.
That is particularly problematic for taps like homebrew/homebrew-fuse because
the `default_formula` in osxfuse conflicts with the osxfuse binary we install
via the Caskroom, which is actively breaking every CI build.
Closes Homebrew/homebrew#48000.
Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index bbce482ab..d6a2c9504 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -9,6 +9,7 @@ # --skip-setup: Don't check the local system is setup correctly. # --skip-homebrew: Don't check Homebrew's files and tests are all valid. # --junit: Generate a JUnit XML test results file. +# --no-bottle: Run brew install without --build-bottle # --keep-old: Run brew bottle --keep-old to build new bottles for a single platform. # --HEAD: Run brew install with --HEAD # --local: Ask Homebrew to write verbose logs under ./logs/ and set HOME to ./home/ @@ -450,7 +451,7 @@ module Homebrew reqs = [] fetch_args = [canonical_formula_name] - fetch_args << "--build-bottle" if !ARGV.include?("--fast") && !formula.bottle_disabled? + fetch_args << "--build-bottle" if !ARGV.include?("--fast") && !ARGV.include?("--no-bottle") && !formula.bottle_disabled? fetch_args << "--force" if ARGV.include? "--cleanup" audit_args = [canonical_formula_name] @@ -564,7 +565,7 @@ module Homebrew test "brew", "fetch", "--retry", *fetch_args test "brew", "uninstall", "--force", canonical_formula_name if formula.installed? install_args = ["--verbose"] - install_args << "--build-bottle" if !ARGV.include?("--fast") && !formula.bottle_disabled? + install_args << "--build-bottle" if !ARGV.include?("--fast") && !ARGV.include?("--no-bottle") && !formula.bottle_disabled? install_args << "--HEAD" if ARGV.include? "--HEAD" # Pass --devel or --HEAD to install in the event formulae lack stable. Supports devel-only/head-only. @@ -591,7 +592,7 @@ module Homebrew end test "brew", "audit", *audit_args if install_passed - if formula.stable? && !ARGV.include?("--fast") && !formula.bottle_disabled? + if formula.stable? && !ARGV.include?("--fast") && !ARGV.include?("--no-bottle") && !formula.bottle_disabled? bottle_args = ["--verbose", "--rb", canonical_formula_name] bottle_args << "--keep-old" if ARGV.include? "--keep-old" test "brew", "bottle", *bottle_args |