Skip to content

Commit

Permalink
[#94]: Fix get_files_to_check.py
Browse files Browse the repository at this point in the history
  • Loading branch information
JacobDomagala committed Sep 3, 2023
1 parent 315cf06 commit 519ecc0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/get_files_to_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()))

0 comments on commit 519ecc0

Please sign in to comment.