pr-pull: don't try to fetch unneeded artifacts
This commit is contained in:
parent
e974dce16e
commit
f575eecabc
@ -114,6 +114,32 @@ module Homebrew
|
|||||||
opoo "Current branch is #{branch}: do you need to pull inside #{ref}?"
|
opoo "Current branch is #{branch}: do you need to pull inside #{ref}?"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def formulae_need_bottles?(tap, original_commit)
|
||||||
|
return if Homebrew.args.dry_run?
|
||||||
|
|
||||||
|
if Homebrew::EnvConfig.disable_load_formula?
|
||||||
|
opoo "Can't check if updated bottles are necessary as formula loading is disabled!"
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
Utils.popen_read("git", "-C", tap.path, "diff-tree",
|
||||||
|
"-r", "--name-only", "--diff-filter=AM",
|
||||||
|
original_commit, "HEAD", "--", tap.formula_dir)
|
||||||
|
.lines.each do |line|
|
||||||
|
next unless line.end_with? ".rb\n"
|
||||||
|
|
||||||
|
name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
|
||||||
|
begin
|
||||||
|
f = Formula[name]
|
||||||
|
rescue Exception # rubocop:disable Lint/RescueException
|
||||||
|
# Make sure we catch syntax errors.
|
||||||
|
next
|
||||||
|
end
|
||||||
|
return true if !f.bottle_unneeded? && !f.bottle_disabled?
|
||||||
|
end
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
def pr_pull
|
def pr_pull
|
||||||
pr_pull_args.parse
|
pr_pull_args.parse
|
||||||
|
|
||||||
@ -144,10 +170,17 @@ module Homebrew
|
|||||||
ohai "Fetching #{tap} pull request ##{pr}"
|
ohai "Fetching #{tap} pull request ##{pr}"
|
||||||
Dir.mktmpdir pr do |dir|
|
Dir.mktmpdir pr do |dir|
|
||||||
cd dir do
|
cd dir do
|
||||||
GitHub.fetch_artifact(user, repo, pr, dir, workflow_id: workflow, artifact_name: artifact)
|
original_commit = Utils.popen_read("git", "-C", tap.path, "rev-parse", "HEAD").chomp
|
||||||
cherry_pick_pr! pr, path: tap.path
|
cherry_pick_pr! pr, path: tap.path
|
||||||
signoff! pr, path: tap.path unless args.clean?
|
signoff! pr, path: tap.path unless args.clean?
|
||||||
|
|
||||||
|
unless formulae_need_bottles? tap, original_commit
|
||||||
|
ohai "Skipping artifacts for ##{pr} as the formulae don't need bottles"
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
GitHub.fetch_artifact(user, repo, pr, dir, workflow_id: workflow, artifact_name: artifact)
|
||||||
|
|
||||||
if Homebrew.args.dry_run?
|
if Homebrew.args.dry_run?
|
||||||
puts "brew bottle --merge --write #{Dir["*.json"].join " "}"
|
puts "brew bottle --merge --write #{Dir["*.json"].join " "}"
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user