Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-JIRA: fix selftest, need to use gmake on macOS #799

Merged
merged 1 commit into from
Dec 9, 2024
Merged

NO-JIRA: fix selftest, need to use gmake on macOS #799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ci/cached-builds/gha_pr_changed_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
import os
import pathlib
import re
import shutil
import subprocess
import unittest

PROJECT_ROOT = pathlib.Path(__file__).parent.parent.parent.resolve()
MAKE = shutil.which("gmake") or shutil.which("make")


def get_github_token() -> str:
Expand All @@ -30,7 +32,7 @@ def analyze_build_directories(make_target) -> list[str]:
pattern = re.compile(r"#\*# Image build directory: <(?P<dir>[^>]+)> #\(MACHINE-PARSED LINE\)#\*#\.\.\.")
try:
logging.debug(f"Running make in --just-print mode for target {make_target}")
for line in subprocess.check_output(["make", make_target, "--just-print"], encoding="utf-8",
for line in subprocess.check_output([MAKE, make_target, "--just-print"], encoding="utf-8",
cwd=PROJECT_ROOT).splitlines():
if m := pattern.match(line):
directories.append(m["dir"])
Expand Down
Loading