Merge pull request #157 from efabless/EF-3614-b

EF-3614-b | fix logging message exception

.gitignore

@@ -1,4 +1,5 @@
 **/__pycache__
+**/parser.out
 **/parsetab.py
 /.idea/
 /.vscode/

dependencies/Dockerfile

@@ -53,7 +53,7 @@ RUN yum -y remove git && yum -y remove git-* && \
 
 # Clone Magic
 ENV MAGIC_ROOT=./magic
-RUN git clone --depth=1 --branch 8.3.339 https://github.com/RTimothyEdwards/magic.git ${MAGIC_ROOT}
+RUN git clone --depth=1 --branch 8.3.340 https://github.com/RTimothyEdwards/magic.git ${MAGIC_ROOT}
 WORKDIR $MAGIC_ROOT
 # Build Magic
 # '-O0' : disable optimization so vars visible in gdb (not optimized away). Already the default of gcc.
@@ -75,4 +75,4 @@ WORKDIR $PRECHECKER_ROOT
 
 # GOLDEN CARAVEL
 ENV GOLDEN_CARAVEL=/opt/caravel
-RUN git clone --branch mpw-7e --depth=1 https://github.com/efabless/caravel-lite.git ${GOLDEN_CARAVEL} && make -C ${GOLDEN_CARAVEL} uncompress
+RUN git clone --branch mpw-7f --depth=1 https://github.com/efabless/caravel-lite.git ${GOLDEN_CARAVEL} && make -C ${GOLDEN_CARAVEL} uncompress

mpw_precheck.py

@@ -49,9 +49,9 @@ def log_info(precheck_config, project_config):
             with open(precheck_config['pdk_path'] / '.config/nodeinfo.json') as f:
                 pdk_nodeinfo = json.load(f)
                 open_pdks_commit = pdk_nodeinfo['commit']['open_pdks']
-                pdk_commit = pdk_nodeinfo['reference'].get('skywater_pdk', pdk_nodeinfo['reference']['gf180mcu_pdk'])
+                pdk_commit = pdk_nodeinfo['reference'].get('skywater_pdk', pdk_nodeinfo['reference'].get('gf180mcu_pdk'))
             pdks_info.write(f"Open PDKs {open_pdks_commit}\n")
-            pdks_info.write(f"Skywater PDK {pdk_commit}")
+            pdks_info.write(f"{precheck_config['pdk_path'].name.upper()} PDK {pdk_commit}")
             logging.info(f"{{{{PDKs Info}}}} {precheck_config['pdk_path'].name.upper()}: {pdk_commit} | Open PDKs: {open_pdks_commit}")
         except Exception as e:
             logging.error(f"MPW Precheck failed to retreive {precheck_config['pdk_path'].name.upper()} PDK & Open PDKs commits: {e}")