TinyTapeout/tt-support-tools
1
0
Fork 0
mirror of https://github.com/TinyTapeout/tt-support-tools.git synced 2026-11-03 04:36:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(tt_tool): create merged config right after creating user config

Browse Source 
This allows users to simply run `--create-user-config` and then manually harden with librelane using the generated config file.
This commit is contained in:
Uri Shaked
2025-09-25 12:57:37 +03:00
parent fcb93fde4a
commit d14142e412
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project.py
+8 -5
View File
@@ -465,6 +465,12 @@ class Project:
new_sources.append(s) new_sources.append(s)
self.sources = new_sources self.sources = new_sources
def create_merged_config(self):
config = read_config("src/config")
user_config = read_config("src/user_config")
config.update(user_config)
write_config(config, "src/config_merged")
def create_user_config(self): def create_user_config(self):
if self.is_wokwi(): if self.is_wokwi():
self.fetch_wokwi_files() self.fetch_wokwi_files()
@@ -485,6 +491,7 @@ class Project:
"RT_MAX_LAYER": self.tech.project_top_metal_layer, "RT_MAX_LAYER": self.tech.project_top_metal_layer,
} }
write_config(config, os.path.join(self.src_dir, "user_config"), ("json",)) write_config(config, os.path.join(self.src_dir, "user_config"), ("json",))
self.create_merged_config()
def golden_harden(self): def golden_harden(self):
logging.info(f"hardening {self}") logging.info(f"hardening {self}")
@@ -500,11 +507,7 @@ class Project:
tt_version = self.get_tt_tools_version() tt_version = self.get_tt_tools_version()
workflow_url = self.get_workflow_url() workflow_url = self.get_workflow_url()
config = read_config("src/config") self.create_merged_config()
user_config = read_config("src/user_config")
config.update(user_config)
write_config(config, "src/config_merged")
shutil.rmtree("runs/wokwi", ignore_errors=True) shutil.rmtree("runs/wokwi", ignore_errors=True)
os.makedirs("runs/wokwi", exist_ok=True) os.makedirs("runs/wokwi", exist_ok=True)
arg_progress = "--hide-progress-bar" if "CI" in os.environ else "" arg_progress = "--hide-progress-bar" if "CI" in os.environ else ""