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

Update and temporarily disable GNU mirror audit

Browse Source 
Update the audit to prefer ftpmirror.gnu.org over ftp.gnu.org as
suggested by GNU [1]:

> We recommend using this generic ftpmirror.gnu.org address wherever
> possible in links, documentation, etc., to reduce load on the main GNU
> server.

The audit is temporarily disabled to allow migrating all homebrew/core
formulae first.

Should help to address #20456.

[1]: https://www.gnu.org/server/mirror.en.html
This commit is contained in:
Ruoyu Zhong 2025-08-14 22:03:13 +08:00
parent fbac21da54
commit 049e8cc61c
No known key found for this signature in database
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/rubocops/shared/url_helper.rb
View File

@ -41,11 +41,11 @@ module RuboCop
problem "Please use the ASCII (Punycode-encoded host, URL-encoded path and query) version of #{url}." problem "Please use the ASCII (Punycode-encoded host, URL-encoded path and query) version of #{url}."
end end
# GNU URLs; doesn't apply to mirrors # TODO: Re-add the following audit after homebrew/core migration.
gnu_pattern = %r{^(?:https?|ftp)://ftpmirror\.gnu\.org/(.*)} # gnu_pattern = %r{^(?:https?|ftp)://ftp\.gnu\.org/(.*)}
audit_urls(urls, gnu_pattern) do |match, url| # audit_urls(urls, gnu_pattern) do |match, url|
problem "#{url} should be: https://ftp.gnu.org/gnu/#{match[1]}" # problem "#{url} should be: https://ftpmirror.gnu.org/gnu/#{match[1]}"
end # end
# Fossies upstream requests they aren't used as primary URLs # Fossies upstream requests they aren't used as primary URLs
# https://github.com/Homebrew/homebrew-core/issues/14486#issuecomment-307753234 # https://github.com/Homebrew/homebrew-core/issues/14486#issuecomment-307753234

20
Library/Homebrew/test/rubocops/urls_spec.rb
View File

@ -6,12 +6,14 @@ RSpec.describe RuboCop::Cop::FormulaAudit::Urls do
subject(:cop) { described_class.new } subject(:cop) { described_class.new }
let(:offense_list) do let(:offense_list) do
# TODO: Re-add the following to the offense list after homebrew/core migration.
# {
# "url" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz",
# "msg" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz should be: " \
# "https://ftp.gnu.org/gnu/lightning/lightning-2.1.0.tar.gz",
# "col" => 2,
# }
[{ [{
"url" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz",
"msg" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz should be: " \
"https://ftp.gnu.org/gnu/lightning/lightning-2.1.0.tar.gz",
"col" => 2,
}, {
"url" => "https://fossies.org/linux/privat/monit-5.23.0.tar.gz", "url" => "https://fossies.org/linux/privat/monit-5.23.0.tar.gz",
"msg" => "Please don't use \"fossies.org\" in the `url` (using as a mirror is fine)", "msg" => "Please don't use \"fossies.org\" in the `url` (using as a mirror is fine)",
"col" => 2, "col" => 2,
@ -209,10 +211,10 @@ RSpec.describe RuboCop::Cop::FormulaAudit::Urls do
offenses = inspect_source(source) offenses = inspect_source(source)
expected_offenses.zip(offenses.reverse).each do |expected, actual| expected_offenses.zip(offenses.reverse).each do |expected, actual|
expect(actual.message).to eq(expected[:message]) expect(actual&.message).to eq(expected[:message])
expect(actual.severity).to eq(expected[:severity]) expect(actual&.severity).to eq(expected[:severity])
expect(actual.line).to eq(expected[:line]) expect(actual&.line).to eq(expected[:line])
expect(actual.column).to eq(expected[:column]) expect(actual&.column).to eq(expected[:column])
end end
end end
end end