commit 030623058a178917e2752bb29a5a16b426ec5691
author Jeff DiCorpo <42048757+jeffdi@users.noreply.github.com> Fri Jul 01 08:32:27 2022 -0700
committer GitHub <noreply@github.com> Fri Jul 01 08:32:27 2022 -0700
tree 3b53d193984825adae1067babc4a42a7b9bd9c1b
parent cc08105187ec004beeec23d4cd6965548a9eb16b
parent 1c07a1a261ef7ff9c6d6c7e72ca19833a748eb42

Merge pull request #24 from efabless/EF-3367

EF-3367

.github/workflows/user_project_ci.yml

diff --git a/.github/workflows/user_project_ci.yml b/.github/workflows/user_project_ci.yml
index fd620d2..f9fa46f 100644
--- a/.github/workflows/user_project_ci.yml
+++ b/.github/workflows/user_project_ci.yml
@@ -38,8 +38,8 @@
               export PRECHECK_ROOT=$INPUT_DIRECTORY/mpw_precheck
               export OUTPUT_DIRECTORY=$INPUT_DIRECTORY/mpw_precheck_result
               export OUTPUT=$OUTPUT_DIRECTORY/logs/precheck.log
-              git clone --depth=1 -b mpw-5b https://github.com/efabless/mpw_precheck.git
-              docker run -v "$PRECHECK_ROOT":"$PRECHECK_ROOT" -v "$INPUT_DIRECTORY":"$INPUT_DIRECTORY" -v "${{ env.PDK_ROOT }}":"${{ env.PDK_ROOT }}" -e INPUT_DIRECTORY="$INPUT_DIRECTORY" -e PDK_ROOT="${{ env.PDK_ROOT }}" -e PDKPATH="${{ env.PDKPATH }}" -u $(id -u "$USER"):$(id -g "$USER") efabless/mpw_precheck:latest bash -c "cd $PRECHECK_ROOT; python3 mpw_precheck.py --input_directory $INPUT_DIRECTORY --pdk_root ${{ env.PDK_ROOT }} --output_directory $OUTPUT_DIRECTORY license makefile consistency xor magic_drc klayout_beol klayout_feol klayout_met_min_ca_density klayout_offgrid klayout_pin_label_purposes_overlapping_drawing klayout_zeroarea"
+              git clone --depth=1 -b mpw-7a https://github.com/efabless/mpw_precheck.git
+              docker run -v "$PRECHECK_ROOT":"$PRECHECK_ROOT" -v "$INPUT_DIRECTORY":"$INPUT_DIRECTORY" -v "${{ env.PDK_ROOT }}":"${{ env.PDK_ROOT }}" -e INPUT_DIRECTORY="$INPUT_DIRECTORY" -e PDK_ROOT="${{ env.PDK_ROOT }}" -e PDKPATH="${{ env.PDKPATH }}" -u $(id -u "$USER"):$(id -g "$USER") efabless/mpw_precheck:latest bash -c "cd $PRECHECK_ROOT; python3 mpw_precheck.py --input_directory $INPUT_DIRECTORY --pdk_path ${{ env.PDKPATH }} --output_directory $OUTPUT_DIRECTORY license makefile consistency xor magic_drc klayout_beol klayout_feol klayout_met_min_ca_density klayout_offgrid klayout_pin_label_purposes_overlapping_drawing klayout_zeroarea"
               cnt=$(grep -c "All Checks Passed" "$OUTPUT")
               if ! [[ $cnt ]]; then cnt=0; fi
               if [[ $cnt -eq 1 ]]; then exit 0; fi

.gitignore

diff --git a/.gitignore b/.gitignore
index bd35ce4..f770f0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-precheck_results
+/.idea/
+/precheck_results/
 */tmp
 */*/tmp
\ No newline at end of file

Makefile

diff --git a/Makefile b/Makefile
index 334b780..b15b06f 100644
--- a/Makefile
+++ b/Makefile
@@ -115,10 +115,10 @@
 	-v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \
 	-v $(PDK_ROOT):$(PDK_ROOT) \
 	-e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \
-	-e PDK_ROOT=$(PDK_ROOT) \
+	-e PDK_PATH=$(PDK_ROOT)/$(PDK) \
 	-e PDKPATH=$(PDKPATH) \
 	-u $(shell id -u $(USER)):$(shell id -g $(USER)) \
-	efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 mpw_precheck.py --input_directory $(INPUT_DIRECTORY) --pdk_root $(PDK_ROOT)"
+	efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 mpw_precheck.py --input_directory $(INPUT_DIRECTORY) --pdk_path $($PDK_PATH)"
 
 # Clean 
 .PHONY: clean