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

Minor fixes to CI script.

Browse Source 
I had problems with proper resolution of codeql_repo_dir with old python installation, this fixes it
This commit is contained in:
Rasmus Wriedt Larsen
2024-05-02 15:13:50 +02:00
parent 7d92ec5ddf
commit 2cff081f2b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
misc/scripts/accept-expected-changes-from-ci.py
View File

@@ -38,14 +38,13 @@ DEBUG_LOG_FILE = None
def _get_codeql_repo_dir() -> Path:
return Path(__file__).parent.parent.parent
return Path(__file__).parent.parent.parent.resolve()
CODEQL_REPO_DIR = _get_codeql_repo_dir()
def _get_semmle_code_dir() -> Optional[Path]:
guess = CODEQL_REPO_DIR.parent
guess = CODEQL_REPO_DIR.parent.resolve()
try:
out = subprocess.check_output(
["git", "remote", "-v"],
@@ -413,7 +412,7 @@ def main(pr_number: Optional[int], sha_override: Optional[str] = None, force=Fal
subprocess.check_call(["git", "apply", temp.name], cwd=patch.dir)
if "CONSISTENCY" in patch.filename.parts:
if "CONSISTENCY" in patch.filename.parts and patch.filename.exists():
# delete if empty
if os.path.getsize(patch.filename) == 1 and patch.filename.read_text() == "\n":
os.remove(patch.filename)