From 519ecc02729ab4fbc3268a36d8499822c5613529 Mon Sep 17 00:00:00 2001 From: Jacob Domagala Date: Sun, 3 Sep 2023 16:19:00 +0200 Subject: [PATCH] [#94]: Fix get_files_to_check.py --- entrypoint.sh | 3 ++- src/get_files_to_check.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 5fd94d4..7dcd061 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -63,9 +63,10 @@ if [ "$INPUT_REPORT_PR_CHANGES_ONLY" = true ]; then git fetch origin - git diff --name-only origin/"$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF" | grep -E '\.(c|cpp|h|hpp)$' + # git diff --name-only origin/"$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF" | grep -E '\.(c|cpp|h|hpp)$' common_ancestor=$(git merge-base "origin/$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF") + git diff --name-only "$common_ancestor" | grep -E '\.(c|cpp|h|hpp)$' preselected_files="$(git diff --name-only "$common_ancestor" | grep -E '\.(c|cpp|h|hpp)$')" debug_print "Preselected files: \n$preselected_files" fi diff --git a/src/get_files_to_check.py b/src/get_files_to_check.py index 7524146..e0b1d47 100644 --- a/src/get_files_to_check.py +++ b/src/get_files_to_check.py @@ -36,8 +36,9 @@ def get_files_to_check(directory_in, excludes_in, preselected_files): all_files.append(path_) else: for file in preselected_files: - print(f"File = {file}") - if not file.endswith(tuple(exclude_prefixes)): + if not file.startswith(directory_in): + file = f"{directory_in}/{file}" + if not file.startswith(tuple(exclude_prefixes)): all_files.append(file) return " ".join(all_files) @@ -46,11 +47,11 @@ def get_files_to_check(directory_in, excludes_in, preselected_files): if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("-exclude", help="Exclude prefix", required=False) - parser.add_argument("-preselected", help="Preselected files", required=False) + parser.add_argument("-preselected", help="Preselected files", default="", required=False) parser.add_argument("-dir", help="Source directory", required=True) directory = parser.parse_args().dir preselected = parser.parse_args().preselected excludes = parser.parse_args().exclude - print(get_files_to_check(directory, excludes, preselected)) + print(get_files_to_check(directory, excludes, preselected.split()))