admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15594 from carlocab/staging-branch-audit

Browse Source 
formula_auditor: make OpenSSL audit exception generic
This commit is contained in:
Mike McQuaid 2023-06-27 09:54:20 +01:00 committed by GitHub
commit 3b5e015001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/formula_auditor.rb
View File

@ -346,19 +346,24 @@ module Homebrew
# TODO: remove this and check these there too. # TODO: remove this and check these there too.
return if Homebrew::SimulateSystem.simulating_or_running_on_linux? return if Homebrew::SimulateSystem.simulating_or_running_on_linux?
# Skip the versioned dependencies conflict audit for OpenSSL on the OpenSSL migration staging branch. # Skip the versioned dependencies conflict audit for *-staging branches.
# TODO: Remove this when OpenSSL migration is complete. # This will allow us to migrate dependents of formulae like Python or OpenSSL
ignore_openssl_conflict = if @tap_audit && (github_event_path = ENV.fetch("GITHUB_EVENT_PATH", nil)).present? # gradually over separate PRs which target a *-staging branch. See:
# https://github.com/Homebrew/homebrew-core/pull/134260
ignore_formula_conflict, staging_formula =
if @tap_audit && (github_event_path = ENV.fetch("GITHUB_EVENT_PATH", nil)).present?
event_payload = JSON.parse(File.read(github_event_path)) event_payload = JSON.parse(File.read(github_event_path))
base_info = event_payload.dig("pull_request", "base").to_h # handle `nil` base_info = event_payload.dig("pull_request", "base").to_h # handle `nil`
# We need to read the head ref from `GITHUB_EVENT_PATH` because # We need to read the head ref from `GITHUB_EVENT_PATH` because
# `git branch --show-current` returns `master` on PR branches. # `git branch --show-current` returns `master` on PR branches.
openssl_migration_branch = base_info["ref"] == "openssl-migration-staging" staging_branch = base_info["ref"]&.end_with?("-staging")
homebrew_owned_repo = base_info.dig("repo", "owner", "login") == "Homebrew" homebrew_owned_repo = base_info.dig("repo", "owner", "login") == "Homebrew"
homebrew_core_pr = base_info.dig("repo", "name") == "homebrew-core" homebrew_core_pr = base_info.dig("repo", "name") == "homebrew-core"
# Support staging branches named `formula-staging` or `formula@version-staging`.
base_formula = base_info["ref"]&.split(/-|@/, 2)&.first
openssl_migration_branch && homebrew_owned_repo && homebrew_core_pr [staging_branch && homebrew_owned_repo && homebrew_core_pr, base_formula]
end end
recursive_runtime_formulae = formula.runtime_formula_dependencies(undeclared: false) recursive_runtime_formulae = formula.runtime_formula_dependencies(undeclared: false)
@ -367,7 +372,7 @@ module Homebrew
recursive_runtime_formulae.each do |f| recursive_runtime_formulae.each do |f|
name = f.name name = f.name
unversioned_name, = name.split("@") unversioned_name, = name.split("@")
next if unversioned_name == "openssl" && ignore_openssl_conflict next if ignore_formula_conflict && unversioned_name == staging_formula
# Allow use of the full versioned name (e.g. `python@3.99`) or an unversioned alias (`python`). # Allow use of the full versioned name (e.g. `python@3.99`) or an unversioned alias (`python`).
next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, name next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, name
next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, unversioned_name next if formula.tap&.audit_exception :versioned_formula_dependent_conflicts_allowlist, unversioned_name