Update Makefile to remove open_ from precheck root
diff --git a/.github/scripts/precheck/run-precheck-drc.sh b/.github/scripts/precheck/run-precheck-drc.sh index 8ad7b7a..b13d0ec 100644 --- a/.github/scripts/precheck/run-precheck-drc.sh +++ b/.github/scripts/precheck/run-precheck-drc.sh
@@ -17,7 +17,7 @@ export CARAVEL_ROOT=$(pwd)/caravel cd .. export PDK_ROOT=$(pwd)/precheck_pdks -cd $TARGET_PATH/open_mpw_precheck/ +cd $TARGET_PATH/mpw_precheck/ docker run -v $(pwd):/usr/local/bin -v $TARGET_PATH:$TARGET_PATH -v $CARAVEL_ROOT:$CARAVEL_ROOT -v $PDK_ROOT:$PDK_ROOT -u $(id -u $USER):$(id -g $USER) efabless/mpw_precheck:latest bash -c "python3 mpw_precheck.py check magic_drc klayout_offgrid klayout_feol klayout_zeroarea klayout_pin_label_purposes_overlapping_drawing --pdk_root $PDK_ROOT --input_direcoty $TARGET_PATH --caravel_root $CARAVEL_ROOT" output=$TARGET_PATH/checks/full_log.log
diff --git a/.github/workflows/user_project_ci.yml b/.github/workflows/user_project_ci.yml index 6180235..4723ed5 100644 --- a/.github/workflows/user_project_ci.yml +++ b/.github/workflows/user_project_ci.yml
@@ -62,10 +62,7 @@ uses: docker/setup-buildx-action@v1 - name: Install The PDK - run: | - apt-get update - apt-get install git -y - bash ${GITHUB_WORKSPACE}/.github/scripts/dv/pdkBuild.sh + run: bash ${GITHUB_WORKSPACE}/.github/scripts/dv/pdkBuild.sh env: OPENLANE_TAG: v0.12
diff --git a/Makefile b/Makefile index fced6b7..dc9be17 100644 --- a/Makefile +++ b/Makefile
@@ -15,7 +15,7 @@ # SPDX-License-Identifier: Apache-2.0 CARAVEL_ROOT?=$(PWD)/caravel -PRECHECK_ROOT?=${HOME}/open_mpw_precheck +PRECHECK_ROOT?=${HOME}/mpw_precheck SIM ?= RTL # Install lite version of caravel, (1): caravel-lite, (0): caravel @@ -35,9 +35,9 @@ SUBMODULE?=1 # Include Caravel Makefile Targets -.PHONY: % +.PHONY: % : check-caravel %: - $(MAKE) -f $(CARAVEL_ROOT)/Makefile $@ + export CARAVEL_ROOT=$(CARAVEL_ROOT) && $(MAKE) -f $(CARAVEL_ROOT)/Makefile $@ # Verify Target for running simulations .PHONY: verify