[CI] Fix precheck output dir
diff --git a/.github/scripts/precheck/run-precheck-drc.sh b/.github/scripts/precheck/run-precheck-drc.sh index 3a138dd..e9fd3a2 100644 --- a/.github/scripts/precheck/run-precheck-drc.sh +++ b/.github/scripts/precheck/run-precheck-drc.sh
@@ -18,12 +18,13 @@ cd .. export PDK_ROOT=$(pwd)/precheck_pdks export PRECHECK_ROOT=$TARGET_PATH/mpw_precheck/ +export OUTPUT_DIRECTORY=$TARGET_PATH/checks cd $TARGET_PATH/mpw_precheck/ -docker run -v $PRECHECK_ROOT:$PRECHECK_ROOT -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 "cd $PRECHECK_ROOT; python3 mpw_precheck.py magic_drc klayout_offgrid klayout_feol klayout_zeroarea klayout_pin_label_purposes_overlapping_drawing --pdk_root $PDK_ROOT --input_directory $TARGET_PATH --caravel_root $CARAVEL_ROOT" -output=$TARGET_PATH/checks/full_log.log +docker run -v $PRECHECK_ROOT:$PRECHECK_ROOT -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 "cd $PRECHECK_ROOT; python3 mpw_precheck.py magic_drc klayout_offgrid klayout_feol klayout_zeroarea klayout_pin_label_purposes_overlapping_drawing --pdk_root $PDK_ROOT --input_directory $TARGET_PATH --caravel_root $CARAVEL_ROOT --output_directory $OUTPUT_DIRECTORY" +output=$OUTPUT_DIRECTORY/precheck.log -gzipped_file=$TARGET_PATH/checks/full_log.log.gz +gzipped_file=$OUTPUT_DIRECTORY/precheck.log.gz if [[ -f $gzipped_file ]]; then gzip -d $gzipped_file @@ -31,7 +32,7 @@ grep "Violation Message" $output -cnt=$(grep -c "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 \ No newline at end of file
diff --git a/.github/scripts/precheck/run-precheck.sh b/.github/scripts/precheck/run-precheck.sh index cd23f7f..129f115 100644 --- a/.github/scripts/precheck/run-precheck.sh +++ b/.github/scripts/precheck/run-precheck.sh
@@ -18,12 +18,13 @@ cd .. export PDK_ROOT=$(pwd)/precheck_pdks export PRECHECK_ROOT=$TARGET_PATH/mpw_precheck/ +export OUTPUT_DIRECTORY=$TARGET_PATH/checks cd $TARGET_PATH/mpw_precheck/ -docker run -v $PRECHECK_ROOT:$PRECHECK_ROOT -v $TARGET_PATH:$TARGET_PATH -v $PDK_ROOT:$PDK_ROOT -v $CARAVEL_ROOT:$CARAVEL_ROOT -u $(id -u $USER):$(id -g $USER) efabless/mpw_precheck:latest bash -c " cd $PRECHECK_ROOT ; python3 mpw_precheck.py license yaml manifest makefile consistency xor --pdk_root $PDK_ROOT --input_directory $TARGET_PATH --caravel_root $CARAVEL_ROOT" -output=$TARGET_PATH/checks/full_log.log +docker run -v $PRECHECK_ROOT:$PRECHECK_ROOT -v $TARGET_PATH:$TARGET_PATH -v $PDK_ROOT:$PDK_ROOT -v $CARAVEL_ROOT:$CARAVEL_ROOT -u $(id -u $USER):$(id -g $USER) efabless/mpw_precheck:latest bash -c " cd $PRECHECK_ROOT ; python3 mpw_precheck.py license yaml manifest makefile consistency xor --pdk_root $PDK_ROOT --input_directory $TARGET_PATH --caravel_root $CARAVEL_ROOT --output_directory $OUTPUT_DIRECTORY" +output=$OUTPUT_DIRECTORY/precheck.log -gzipped_file=$TARGET_PATH/checks/full_log.log.gz +gzipped_file=$OUTPUT_DIRECTORY/precheck.log.gz if [[ -f $gzipped_file ]]; then gzip -d $gzipped_file @@ -31,7 +32,7 @@ grep "Violation Message" $output -cnt=$(grep -c "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