test-bot: allow bottle --merge to fail.
It may still write some bottles so let's allow them to be uploaded.
This commit is contained in:
parent
76488216b7
commit
036aab567d
@ -789,7 +789,7 @@ module Homebrew
|
|||||||
bottle_args = ["--merge", "--write", *Dir["*.bottle.rb"]]
|
bottle_args = ["--merge", "--write", *Dir["*.bottle.rb"]]
|
||||||
bottle_args << "--tap=#{tap}" if tap
|
bottle_args << "--tap=#{tap}" if tap
|
||||||
bottle_args << "--keep-old" if ARGV.include? "--keep-old"
|
bottle_args << "--keep-old" if ARGV.include? "--keep-old"
|
||||||
safe_system "brew", "bottle", *bottle_args
|
system "brew", "bottle", *bottle_args
|
||||||
|
|
||||||
remote_repo = tap ? "homebrew-#{tap.repo}" : "homebrew"
|
remote_repo = tap ? "homebrew-#{tap.repo}" : "homebrew"
|
||||||
remote = "git@github.com:BrewTestBot/#{remote_repo}.git"
|
remote = "git@github.com:BrewTestBot/#{remote_repo}.git"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user