From 03427b132d378e78cc73ec0820249067a9d225cf Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 30 Dec 2021 21:28:21 -0500 Subject: [PATCH] Regression bug: Fixed incorrect file search --- supplemental/cron/health_srcdiff.conf.in | 92 ++---------------------- supplemental/cron/health_srcdiff.pl | 4 +- 2 files changed, 9 insertions(+), 87 deletions(-) diff --git a/supplemental/cron/health_srcdiff.conf.in b/supplemental/cron/health_srcdiff.conf.in index f5322f7..663da63 100644 --- a/supplemental/cron/health_srcdiff.conf.in +++ b/supplemental/cron/health_srcdiff.conf.in @@ -1,75 +1,6 @@ nodiff_files_src => [ - "account.cpp", - "avataruploader.cpp", - "c_archive.cpp", - "c_cache_obj.cpp", - "c_config.cpp", - "c_date_spelling.cpp", - "c_float.cpp", - "c_price_spelling.cpp", - "c_smsc.cpp", - "cactivator.cpp", - "ccgi.cpp", - "ccookie.cpp", - "cexception.cpp", - "cfiles.cpp", - "chtml.cpp", - "cmail.cpp", - "cmysql.cpp", - "crequest.cpp", - "csession.cpp", - "cstatistics.cpp", - "ctemplate.cpp", - "cuser.cpp", - "cvars.cpp", - "cvideoconverter.cpp", - "generalimageuploader.cpp", - "helpdesk.cpp", - "imageuploader.cpp", - "noauth.cpp", - "utilities1.cpp", - "utilities2.cpp", - "utilities_common.cpp", - "tests/auto/autotest_c_price_spelling.cpp", - "account.h", - "avataruploader.h", - "c_archive.h", - "c_cache_obj.h", - "c_config.h", - "c_date_spelling.h", - "c_float.h", - "c_price_spelling.h", - "c_smsc.h", - "cactivator.h", - "ccgi.h", - "ccookie.h", - "cexception.h", - "cfiles.h", - "clog.h", - "chtml.h", - "cmail.h", - "cmysql.h", - "crequest.h", - "csession.h", - "cstatistics.h", - "ctemplate.h", - "cuser.h", - "cvars.h", - "cvideoconverter.h", - "generalimageuploader.h", - "helpdesk.h", - "imageuploader.h", - "noauth.h", - "utilities_common.h", - "utilities.h", - "localy.h.in", - - "cron_minute_pi.cpp", - "cron_daily_pi.cpp", - "cron_minute_pi.h", - "cron_daily_pi.h", "system.cpp", "git_commit.pl", @@ -98,16 +29,15 @@ nodiff_files_src => [ "supplemental/config/CMakeLists.txt", + + ".github/actions/linters/.eslintrc.yaml", + ".github/actions/release-drafter/release-drafter.yml", + ".github/actions/spelling/only.txt", ".github/workflows/qa.yml", - ".github/workflows/sast.yml", - ".github/workflows/release-deploymnet.yml", ".github/workflows/release-drafter.yml", + ".github/workflows/sast.yml", ".github/workflows/spell_check.yml", ".github/workflows/super_linter.yml", - ".github/actions/release-drafter/release-drafter.yaml", - ".github/actions/spell_check/only.txt", - ".github/actions/spell_check/excludes.txt", - ".github/actions/linters/.eslintrc.yaml", ], @@ -117,9 +47,9 @@ nodiff_files_html => [ "helpdesk.css", "login.css", "admin/common.css", - "ru/pages/common.css", + "html/css/pages/common.css", - "faq.js", + "pi/faq.js", "session.js", "login.js", "email_change.js", @@ -170,14 +100,6 @@ nodiff_files_html => [ "admin_header.htmlt", "admin_chat_get_cnx_list.htmlt", "admin_chat_get_presence_cache.htmlt", - - ".github/workflows/release-drafter.yml", - ".github/workflows/spell_check.yml", - ".github/workflows/super_linter.yml", - ".github/actions/release-drafter/release-drafter.yaml", - ".github/actions/spell_check/only.txt", - ".github/actions/spell_check/excludes.txt", - ".github/actions/linters/.eslintrc.yaml", ], exclude_domains => [ diff --git a/supplemental/cron/health_srcdiff.pl b/supplemental/cron/health_srcdiff.pl index 9757d53..0d8b899 100755 --- a/supplemental/cron/health_srcdiff.pl +++ b/supplemental/cron/health_srcdiff.pl @@ -171,7 +171,7 @@ sub DiffFile } else { - PrintError("found ".($#files + 1)." x ".$curr_file." in ".$root_dir.", must be ".($#domains + 1)) if($DEBUG); + PrintError("found ".($#files + 1)." x ".$curr_file." in ".$root_dir.", must be ".($#domains + 1)); } } @@ -213,7 +213,7 @@ sub __find_sub { # --- skip build folder } - elsif($F =~ m/\/pi\//) + elsif($F =~ m/\/src\/pi\//) { # --- skip pi folder }