From f8863c8a3bbef32dc65c9b95a57b54d7fc26c27e Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 24 Feb 2020 23:26:28 +0100 Subject: [PATCH] pull: fix remote on jenkins --- Library/Homebrew/dev-cmd/pull.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index 734131b256..a89d851390 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -290,7 +290,8 @@ module Homebrew # Use `homebrew` remote if HOMEBREW_FORCE_HOMEBREW_ON_LINUX env variable is set. # The `homebrew` remote points to homebrew-core tap and is used by Linux maintainers. # See https://docs.brew.sh/Homebrew-linuxbrew-core-Maintainer-Guide#preparation - remote = ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] ? "homebrew" : "origin" + # Skip that on Jenkins, because upload job runs on Linux. + remote = (ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] && ENV["JENKINS_HOME"].nil?) ? "homebrew" : "origin" safe_system "git", "fetch", "--quiet", remote, "pull/#{pr_number}/head" Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1 end