Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix type comparison for gh #18031

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −1
Open

Fix type comparison for gh #18031

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a3a474
Fix type comparison for gh
pmartindev Aug 12, 2024
9526002
Merge branch 'master' into pmartindev/type-fix-gh
pmartindev Aug 12, 2024
30fadc0
Update Library/Homebrew/attestation.rb
pmartindev Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Library/Homebrew/attestation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ def self.enabled?
return false if ENV.fetch("CI", false)
return false if OS.unsupported_configuration?

gh_version = Formula["gh"].any_installed_version
return false if gh_version.nil? || gh_version.version < "2.49"

# Always check credentials last to avoid unnecessary credential extraction.
(Homebrew::EnvConfig.developer? || Homebrew::EnvConfig.devcmdrun?) && GitHub::API.credentials.present?
end
Expand All @@ -78,7 +81,7 @@ def self.gh_executable
# to prevent a cycle during bootstrapping. This can eventually be resolved
# by vendoring a pure-Ruby Sigstore verifier client.
with_env(HOMEBREW_NO_VERIFY_ATTESTATIONS: "1") do
@gh_executable = ensure_executable!("gh", reason: "verifying attestations", latest: true)
@gh_executable = ensure_formula_installed!("gh", reason: "verifying attestations", latest: true).opt_bin/"gh"
end

T.must(@gh_executable)
Expand Down
Loading