Merge branch 'develop' of https://github.com/efabless/caravel into develop
diff --git a/.travisCI/precheck/precheckBuild.sh b/.travisCI/precheck/precheckBuild.sh
index 28812ef..e05987b 100644
--- a/.travisCI/precheck/precheckBuild.sh
+++ b/.travisCI/precheck/precheckBuild.sh
@@ -14,15 +14,23 @@
# limitations under the License.
# SPDX-License-Identifier: Apache-2.0
+# By default build pdk since we don't need the other script for the main purpose
+export SKIP_PDK_BUILD=${2:-0}
+
export TARGET_PATH=$(pwd)
git clone https://github.com/efabless/open_mpw_precheck.git
docker pull efabless/open_mpw_precheck:latest
-cd $TARGET_PATH/..
-export PDK_ROOT=$(pwd)/pdks
-mkdir $PDK_ROOT
-cd $TARGET_PATH/open_mpw_precheck/dependencies
-sh build-pdk.sh
-cd $TARGET_DIR
+
+if [ $SKIP_PDK_BUILD -eq 0 ]; then
+ cd $TARGET_PATH/..
+ export PDK_ROOT=$(pwd)/pdks
+ mkdir $PDK_ROOT
+ cd $TARGET_PATH/open_mpw_precheck/dependencies
+ sh build-pdk.sh
+ cd $TARGET_DIR
+
+fi
+
exit 0
diff --git a/.travisCI/precheck/run-precheck.sh b/.travisCI/precheck/run-precheck.sh
index d89cd72..0c2ce93 100644
--- a/.travisCI/precheck/run-precheck.sh
+++ b/.travisCI/precheck/run-precheck.sh
@@ -29,7 +29,7 @@
grep "Violation Message" $output
-cnt=$(grep -c "{{SUCCESS}} All Checks PASSED!" $output)
+cnt=$(grep -c "All Checks PASSED!" $output)
if ! [[ $cnt ]]; then cnt=0; fi
if [[ $cnt -eq 1 ]]; then exit 0; fi
exit 2
diff --git a/openlane/Makefile b/openlane/Makefile
index b556fb5..05c39e5 100644
--- a/openlane/Makefile
+++ b/openlane/Makefile
@@ -63,13 +63,13 @@
@echo "Please export OPENLANE_ROOT"
@exit 1
endif
- git clone https://github.com/efabless/openlane.git --branch=master $(OPENLANE_ROOT) && \
+ git clone https://github.com/efabless/openlane.git --branch=$(OPENLANE_TAG) --depth=1 $(OPENLANE_ROOT) && \
cd $(OPENLANE_ROOT) && \
make openlane
FORCE:
-clean:
+clean:
@echo "Use clean_all to clean everything :)"
clean_all: $(CLEAN)
