From cd03c0f86d2c0b41c06efd4b835c9feaf779e432 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 15 Feb 2019 18:48:37 +0100 Subject: [PATCH] Retry merging once after 5 seconds. --- Library/Homebrew/cask/cmd/automerge.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Library/Homebrew/cask/cmd/automerge.rb b/Library/Homebrew/cask/cmd/automerge.rb index a849d2cef6..b71083bac6 100755 --- a/Library/Homebrew/cask/cmd/automerge.rb +++ b/Library/Homebrew/cask/cmd/automerge.rb @@ -39,6 +39,8 @@ module Cask print "#{Formatter.url(pr["html_url"])} " + retried = false + begin GitHub.merge_pull_request( tap.full_name, @@ -48,6 +50,12 @@ module Cask ) puts "#{Tty.bold}#{Formatter.success("✔")}#{Tty.reset}" rescue + unless retried + retried = true + sleep 5 + retry + end + puts "#{Tty.bold}#{Formatter.error("✘")}#{Tty.reset}" failed << pr["html_url"] end