hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8294 from github/tamasvajk/fix/mad-adjustments

Browse Source 
Fix MaD workflows to be more resilient to missing files
This commit is contained in:
Tamás Vajk
2022-03-22 09:02:37 +01:00
committed by GitHub
parent 3e8bc8b0f2 1538e89bd9
commit 80fb021e32
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
misc/scripts/library-coverage/compare.py
View File

@@ -37,17 +37,26 @@ def compare_folders(folder1, folder2, output_file):
# check if files exist in both folder1 and folder 2
if not utils.check_file_exists(f"{folder1}/{generated_output_rst}"):
expected_files += f"- {generated_output_rst} doesn't exist in folder {folder1}\n"
utils.subprocess_check_output(
["touch", f"{folder1}/{generated_output_rst}"])
if not utils.check_file_exists(f"{folder2}/{generated_output_rst}"):
expected_files += f"- {generated_output_rst} doesn't exist in folder {folder2}\n"
utils.subprocess_check_output(
["touch", f"{folder2}/{generated_output_rst}"])
if not utils.check_file_exists(f"{folder1}/{generated_output_csv}"):
expected_files += f"- {generated_output_csv} doesn't exist in folder {folder1}\n"
utils.subprocess_check_output(
["touch", f"{folder1}/{generated_output_csv}"])
if not utils.check_file_exists(f"{folder2}/{generated_output_csv}"):
expected_files += f"- {generated_output_csv} doesn't exist in folder {folder2}\n"
utils.subprocess_check_output(
["touch", f"{folder2}/{generated_output_csv}"])
return_md += f"\n### {lang}\n\n"
if expected_files != "":
print("Expected files are missing", file=sys.stderr)
return_md += f"\n### {lang}\n\n#### Expected files are missing for {lang}\n{expected_files}\n"
continue
return_md += f"#### Expected files are missing for {lang}\n{expected_files}\n\n"
# compare contents of files
cmp1 = compare_files(
@@ -57,7 +66,7 @@ def compare_folders(folder1, folder2, output_file):
if cmp1 != "" or cmp2 != "":
print("Generated file contents are not matching", file=sys.stderr)
return_md += f"\n### {lang}\n\n#### Generated file changes for {lang}\n\n"
return_md += f"#### Generated file changes for {lang}\n\n"
if cmp1 != "":
return_md += f"- Changes to {generated_output_rst}:\n```diff\n{cmp1}```\n\n"
if cmp2 != "":