Simplified and made suitable for each version

citusdata · Jul 23, 2024 · 6cc701f · 6cc701f
1 parent f7d4b24
commit 6cc701f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/packaging_ignore.yml b/packaging_ignore.yml
@@ -9,12 +9,11 @@ base:
   - "gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run"
   - ".* warning: overriding recipe for target 'check'"
   - ".*: E: zero-length /usr/pgsql-.*/share/extension/.*"
-  - "Wrote: /citus-rpm-build/x86_64/topn_11-.*.rpm"
-  - "Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*.rpm"
+  - "Wrote: /citus-rpm-build/x86_64/topn_\d+-.*.rpm"
+  - "Wrote: /citus-rpm-build/x86_64/topn_\d+-debuginfo-.*.rpm"
   - "1 packages and 0 specfiles checked; 0 errors, 0 warnings."
-  - "Wrote: /citus-rpm-build/x86_64/topn_12-debugsource-.*\\.rpm"
-  - "Wrote: /citus-rpm-build/x86_64/topn_12-debuginfo-.*\\.rpm"
-  - "Wrote: /citus-rpm-build/x86_64/topn_12-.*.rpm"
+  - "Wrote: /citus-rpm-build/x86_64/topn_\d+-debugsource-.*.rpm"
+
 debian:
   - ".*: W: invalid-license Commercial"
   - ".*: W: no-documentation"

diff --git a/rpmlintrc b/rpmlintrc
@@ -13,13 +13,11 @@ addFilter('spelling-error %description -l en_US topn')
 
 addFilter(".*: E: zero-length /usr/pgsql-.*/share/extension/.*")
 
-addFilter("Wrote: /citus-rpm-build/x86_64/topn_11-.*\\.rpm")
-addFilter("Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*\\.rpm")
+addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-.*\\.rpm")
+addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-debuginfo-.*\\.rpm")
 addFilter("1 packages and 0 specfiles checked; 0 errors, 0 warnings.")
-addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_11-.*\\.rpm")
-addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*\\.rpm")
+addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_\\d+-.*\\.rpm")
+addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_\\d+-debuginfo-.*\\.rpm")
 addFilter(".*: 1 packages and 0 specfiles checked; 0 errors, 0 warnings.")
-
-addFilter("Wrote: /citus-rpm-build/x86_64/topn_12-debugsource-.*\\.rpm")
-addFilter("Wrote: /citus-rpm-build/x86_64/topn_12-debuginfo-.*\\.rpm")
+addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-debugsource-.*\\.rpm")