From 5bea36799bf7f44b0ced62adf7b90b0dacc5381e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 23 Oct 2018 11:09:04 +0100 Subject: [PATCH 1/2] compat/requirements: add odeprecated. These can be enabled now Homebrew/homebrew-core has been fixed (in https://github.com/Homebrew/homebrew-core/pull/32968). --- Library/Homebrew/compat/requirements/x11_requirement.rb | 3 +-- Library/Homebrew/compat/requirements/xcode_requirement.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/compat/requirements/x11_requirement.rb b/Library/Homebrew/compat/requirements/x11_requirement.rb index bad1f2c73c..4474784548 100644 --- a/Library/Homebrew/compat/requirements/x11_requirement.rb +++ b/Library/Homebrew/compat/requirements/x11_requirement.rb @@ -4,8 +4,7 @@ class X11Requirement < Requirement module Compat def initialize(tags = []) if tags.first.to_s.match?(/(\d\.)+\d/) - # TODO: deprecate when Homebrew/homebrew-core is fixed. - # odeprecated('depends_on :x11 => "X.Y.Z"') + odeprecated('depends_on :x11 => "X.Y.Z"') tags.shift end diff --git a/Library/Homebrew/compat/requirements/xcode_requirement.rb b/Library/Homebrew/compat/requirements/xcode_requirement.rb index 1ceebd2e05..490d157091 100644 --- a/Library/Homebrew/compat/requirements/xcode_requirement.rb +++ b/Library/Homebrew/compat/requirements/xcode_requirement.rb @@ -8,8 +8,7 @@ class XcodeRequirement < Requirement else tags.find do |tag| next unless tag.to_s.match?(/(\d\.)+\d/) - # TODO: deprecate when Homebrew/homebrew-core is fixed. - # odeprecated('depends_on :xcode => [..., "X.Y.Z"]') + odeprecated('depends_on :xcode => [..., "X.Y.Z"]') tags.delete(tag) end end From 284e3b8db47b6460d51b3bf403cde18f52341e48 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 23 Oct 2018 11:28:22 +0100 Subject: [PATCH 2/2] travis.yml: attempt to use travis_wait. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ecc1d9ac8..f4c7d2b074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot script: - - brew test-bot + - travis_wait 60 brew test-bot notifications: slack: machomebrew:1XNF7p1JRCdBUuKaeSwsWEc1