From 310f0f9e52702d4b50d793658766d28ccad914cb Mon Sep 17 00:00:00 2001 From: htfab Date: Fri, 20 Sep 2024 22:43:55 +0200 Subject: [PATCH] fix: handle PDK_ROOT being unset for the docker command line --- project.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project.py b/project.py index de85e89..e0bf830 100644 --- a/project.py +++ b/project.py @@ -506,8 +506,9 @@ def harden(self): if self.args.openlane2: shutil.rmtree("runs/wokwi", ignore_errors=True) os.makedirs("runs/wokwi", exist_ok=True) - progress = "--hide-progress-bar" if "CI" in os.environ else "" - harden_cmd = f"python -m openlane --pdk-root $PDK_ROOT --docker-no-tty --dockerized --run-tag wokwi --force-run-dir runs/wokwi {progress} src/config_merged.json" + arg_progress = "--hide-progress-bar" if "CI" in os.environ else "" + arg_pdk_root = '--pdk-root "$PDK_ROOT"' if "PDK_ROOT" in os.environ else "" + harden_cmd = f"python -m openlane {arg_pdk_root} --docker-no-tty --dockerized --run-tag wokwi --force-run-dir runs/wokwi {arg_progress} src/config_merged.json" else: # requires PDK, PDK_ROOT, OPENLANE_ROOT & OPENLANE_IMAGE_NAME to be set in local environment harden_cmd = "docker run --rm -v $OPENLANE_ROOT:/openlane -v $PDK_ROOT:$PDK_ROOT -v $(pwd):/work -e PDK=$PDK -e PDK_ROOT=$PDK_ROOT -u $(id -u $USER):$(id -g $USER) $OPENLANE_IMAGE_NAME ./flow.tcl -overwrite -design /work/src -run_path /work/runs -config_file /work/src/config_merged.json -tag wokwi"