From b5dec5fdbdeae464716b7d1902bc1f35e912a46a Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Mon, 19 Apr 2021 08:34:13 -0400 Subject: [PATCH] style: temporarily disable GitLab patch URL check --- Library/Homebrew/rubocops/patches.rb | 7 ++++--- Library/Homebrew/test/rubocops/patches_spec.rb | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/rubocops/patches.rb b/Library/Homebrew/rubocops/patches.rb index 79ffc873c6..ca18284891 100644 --- a/Library/Homebrew/rubocops/patches.rb +++ b/Library/Homebrew/rubocops/patches.rb @@ -56,11 +56,12 @@ module RuboCop problem "GitHub patches should end with .patch, not .diff: #{patch_url}" end + # TODO: Uncomment once offenses have been fixed in Homebrew/homebrew-core and Homebrew/linuxbrew-core # Only .diff passes `--full-index` to `git diff` and there is no documented way # to get .patch to behave the same for GitLab. - if regex_match_group(patch_url_node, %r{.*gitlab.*/commit/[a-fA-F0-9]*\.patch}) - problem "GitLab patches should end with .diff, not .patch: #{patch_url}" - end + # if regex_match_group(patch_url_node, %r{.*gitlab.*/commit/[a-fA-F0-9]*\.patch}) + # problem "GitLab patches should end with .diff, not .patch: #{patch_url}" + # end gh_patch_param_pattern = %r{https?://github\.com/.+/.+/(?:commit|pull)/[a-fA-F0-9]*.(?:patch|diff)} if regex_match_group(patch_url_node, gh_patch_param_pattern) && !patch_url.match?(/\?full_index=\w+$/) diff --git a/Library/Homebrew/test/rubocops/patches_spec.rb b/Library/Homebrew/test/rubocops/patches_spec.rb index 1631d076df..4eafb91412 100644 --- a/Library/Homebrew/test/rubocops/patches_spec.rb +++ b/Library/Homebrew/test/rubocops/patches_spec.rb @@ -181,7 +181,8 @@ describe RuboCop::Cop::FormulaAudit::Patches do "https://github.com/uber/h3/pull/362.patch?full_index=1", "https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/142.diff", "https://github.com/michaeldv/pit/commit/f64978d.diff?full_index=1", - "https://gitlab.gnome.org/GNOME/msitools/commit/248450a.patch", + # TODO: Uncomment once the corresponding check is re-enabled + # "https://gitlab.gnome.org/GNOME/msitools/commit/248450a.patch", ] patch_urls.each do |patch_url| source = <<~RUBY @@ -223,10 +224,11 @@ describe RuboCop::Cop::FormulaAudit::Patches do expect_offense_hash message: <<~EOS.chomp, severity: :convention, line: 5, column: 8, source: source GitHub patches should end with .patch, not .diff: #{patch_url} EOS - elsif patch_url.match?(%r{.*gitlab.*/commit/}) - expect_offense_hash message: <<~EOS.chomp, severity: :convention, line: 5, column: 8, source: source - GitLab patches should end with .diff, not .patch: #{patch_url} - EOS + # TODO: Uncomment once the corresponding check is re-enabled + # elsif patch_url.match?(%r{.*gitlab.*/commit/}) + # expect_offense_hash message: <<~EOS.chomp, severity: :convention, line: 5, column: 8, source: source + # GitLab patches should end with .diff, not .patch: #{patch_url} + # EOS # rubocop:disable Layout/LineLength elsif patch_url.match?(%r{https?://patch-diff\.githubusercontent\.com/raw/(.+)/(.+)/pull/(.+)\.(?:diff|patch)}) # rubocop:enable Layout/LineLength