From c65f25de99344fd9df4b30b30dc3676149d218ab Mon Sep 17 00:00:00 2001
From: Matt Venn <matt@mattvenn.net>
Date: Mon, 24 Apr 2023 14:11:32 +0200
Subject: [PATCH] golden harden

---
 configure.py |  3 ++-
 project.py   | 29 ++---------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/configure.py b/configure.py
index c29e498..81d4665 100755
--- a/configure.py
+++ b/configure.py
@@ -106,7 +106,8 @@ class Projects():
 
             if args.harden:
                 if filler is False:
-                    project.harden()
+                    project.create_user_config()
+                    project.golden_harden()
 
             if args.update_caravel:
                 logging.debug("copying files to caravel")
diff --git a/project.py b/project.py
index fa3af1b..fea3444 100644
--- a/project.py
+++ b/project.py
@@ -310,36 +310,11 @@ class Project():
                     fh.write(' \\\n')
             fh.write('"\n')
 
-    """
-    def harden(self):
+    def golden_harden(self):
         logging.info(f"hardening {self}")
-
         # copy golden config
         shutil.copyfile('golden_config.tcl', os.path.join(self.local_dir, 'src', 'config.tcl'))
-
-        cwd = os.getcwd()
-        os.chdir(self.local_dir)
-
-        # setup user config, not including python fails on github action
-        if 'LOCAL' in os.environ:
-            configure_cmd = './configure.py --create-user-config'
-        else:
-            configure_cmd = 'python ./configure.py --create-user-config'
-        p = subprocess.run(configure_cmd, shell=True)
-        if p.returncode != 0:
-            logging.error(f"configure failed for {self}")
-            exit(1)
-
-        # requires 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 /bin/bash -c "./flow.tcl -overwrite -design /work/src -run_path /work/runs -tag wokwi"'
-        env = os.environ.copy()
-        p = subprocess.run(harden_cmd, shell=True, env=env)
-        if p.returncode != 0:
-            logging.error(f"harden failed for {self}")
-            exit(1)
-
-        os.chdir(cwd)
-    """
+        self.harden()
 
     def harden(self):
         cwd = os.getcwd()