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

fix: allow not validating SBOM

Browse Source
This commit is contained in:
Sean Molenaar 2024-05-26 13:16:43 +02:00 committed by GitHub
parent 9e2ff327eb
commit 9d75d09a82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/sbom.rb
View File

@ -121,12 +121,12 @@ class SBOM
end end
end end
sig { params(bottling: T::Boolean).returns(T::Boolean) } sig { params(bottling: T::Boolean).returns(T.nilable(T::Boolean)) }
def valid?(bottling: false) def valid?(bottling: false)
unless require? "json_schemer" unless require? "json_schemer"
error_message = "Need json_schemer to validate SBOM, run `brew install-bundler-gems --add-groups=bottle`!" error_message = "Need json_schemer to validate SBOM, run `brew install-bundler-gems --add-groups=bottle`!"
odie error_message if ENV["HOMEBREW_ENFORCE_SBOM"] odie error_message if ENV["HOMEBREW_ENFORCE_SBOM"]
return false return nil
end end
schema = SBOM.fetch_schema! schema = SBOM.fetch_schema!
@ -156,7 +156,8 @@ class SBOM
# will no longer be valid. # will no longer be valid.
Formula.clear_cache unless spdxfile.exist? Formula.clear_cache unless spdxfile.exist?
if validate && !valid?(bottling:) valid = valid?(bottling:)
if validate && valid.present? && !valid
opoo "SBOM is not valid, not writing to disk!" opoo "SBOM is not valid, not writing to disk!"
return return
end end