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

Revert "attestation: specialize error when gh is old"

Browse Source
This commit is contained in:
William Woodruff 2024-08-12 15:53:17 -04:00 committed by GitHub
parent aafa81b3d9
commit 09c12d817e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/attestation.rb
View File

@ -62,9 +62,6 @@ module Homebrew
return false if ENV.fetch("CI", false) return false if ENV.fetch("CI", false)
return false if OS.unsupported_configuration? return false if OS.unsupported_configuration?
gh_version = Formula["gh"].any_installed_version
return false if gh_version.nil? || gh_version < "2.49"
# Always check credentials last to avoid unnecessary credential extraction. # Always check credentials last to avoid unnecessary credential extraction.
(Homebrew::EnvConfig.developer? || Homebrew::EnvConfig.devcmdrun?) && GitHub::API.credentials.present? (Homebrew::EnvConfig.developer? || Homebrew::EnvConfig.devcmdrun?) && GitHub::API.credentials.present?
end end
@ -81,7 +78,7 @@ module Homebrew
# to prevent a cycle during bootstrapping. This can eventually be resolved # to prevent a cycle during bootstrapping. This can eventually be resolved
# by vendoring a pure-Ruby Sigstore verifier client. # by vendoring a pure-Ruby Sigstore verifier client.
with_env(HOMEBREW_NO_VERIFY_ATTESTATIONS: "1") do with_env(HOMEBREW_NO_VERIFY_ATTESTATIONS: "1") do
@gh_executable = ensure_formula_installed!("gh", reason: "verifying attestations", latest: true).opt_bin/"gh" @gh_executable = ensure_executable!("gh", reason: "verifying attestations", latest: true)
end end
T.must(@gh_executable) T.must(@gh_executable)

9
Library/Homebrew/test/attestation_spec.rb
View File

@ -4,7 +4,6 @@ require "diagnostic"
RSpec.describe Homebrew::Attestation do RSpec.describe Homebrew::Attestation do
let(:fake_gh) { Pathname.new("/extremely/fake/gh") } let(:fake_gh) { Pathname.new("/extremely/fake/gh") }
let(:fake_gh_formula) { instance_double(Formula, opt_bin: Pathname.new("/extremely/fake")) }
let(:fake_old_gh) { Pathname.new("/extremely/fake/old/gh") } let(:fake_old_gh) { Pathname.new("/extremely/fake/old/gh") }
let(:fake_gh_creds) { "fake-gh-api-token" } let(:fake_gh_creds) { "fake-gh-api-token" }
let(:fake_error_status) { instance_double(Process::Status, exitstatus: 1, termsig: nil) } let(:fake_error_status) { instance_double(Process::Status, exitstatus: 1, termsig: nil) }
@ -67,12 +66,12 @@ RSpec.describe Homebrew::Attestation do
end end
describe "::gh_executable" do describe "::gh_executable" do
it "calls ensure_formula_installed" do it "calls ensure_executable" do
expect(described_class).to receive(:ensure_formula_installed!) expect(described_class).to receive(:ensure_executable!)
.with("gh", reason: "verifying attestations", latest: true) .with("gh", reason: "verifying attestations", latest: true)
.and_return(fake_gh_formula) .and_return(fake_gh)
described_class.gh_executable == fake_gh described_class.gh_executable
end end
end end