diff --git a/.github/deploy_sofa.yaml b/.github/deploy_sofa.yaml index 272ce53..a078811 100644 --- a/.github/deploy_sofa.yaml +++ b/.github/deploy_sofa.yaml @@ -53,7 +53,7 @@ jobs: path: open_mpw_precheck - name: Perform checks with open_mpw_precheck - uses: ganeshgore/docker-run-action@1cd63ec + uses: ganeshgore/docker-run-action@49cd3a1 with: image: goreganesh/open_mpw_prechecker options: > @@ -62,7 +62,7 @@ jobs: -e DEST_DIR=$DEST_DIR -e SCAN_DIRECTORY=$SCAN_DIRECTORY --workdir /usr/local/workspace - run: pwd && cd /usr/local/workspace && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh + run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - name: Deploy files run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh diff --git a/.github/workflows/deploy_sofa_hd.yaml b/.github/workflows/deploy_sofa_hd.yaml index 794057f..0fbd6d8 100644 --- a/.github/workflows/deploy_sofa_hd.yaml +++ b/.github/workflows/deploy_sofa_hd.yaml @@ -45,8 +45,10 @@ jobs: uses: ganeshgore/docker-run-action@49cd3a1 with: image: goreganesh/open_mpw_prechecker - options: -v ${{github.workspace}}/open_mpw_precheck:/usr/local/bin -v ${{github.workspace}}:/usr/local/workspace -e DEST_DIR=$DEST_DIR -e SCAN_DIRECTORY=$SCAN_DIRECTORY --workdir /usr/local/workspace - run: pwd && cd /usr/local/workspace && ls && printenv && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh + options: > + -v ${{github.workspace}}/open_mpw_precheck:/usr/local/bin -v ${{github.workspace}}:/usr/local/workspace -e DEST_DIR=$DEST_DIR -e SCAN_DIRECTORY=$SCAN_DIRECTORY --workdir /usr/local/workspace + + run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - name: Deploy files run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh - name: Deploy Changes diff --git a/.github/workflows/perform_precheck.sh b/.github/workflows/perform_precheck.sh index bbc851f..aa43877 100644 --- a/.github/workflows/perform_precheck.sh +++ b/.github/workflows/perform_precheck.sh @@ -4,10 +4,8 @@ # Original repo is places ../SOFA-Chips # for conditional file copy use PROJ_SUFFIX (example SOFA_HD) -printenv - cd ./${DEST_DIR} -echo "Running in directory ${PWD}" +echo "[Info] Running in directory ${PWD}" cp ../SOFA-Chips/${SCAN_DIRECTORY}/fpga_top_icv_in_design.gds.gz ./gds/ make uncompress @@ -43,4 +41,11 @@ if test -f "./checks/caravel.magic.drc"; then python3 ../SOFA-Chips/SCRIPT/magic_drc_to_rdb.py \ -magic_drc_in ./checks/caravel.magic.drc -rdb_out ./checks/caravel.magic.rdb -fi \ No newline at end of file +fi +echo "[Info] Converted errors in RDB format" + +# = = = = = = = Clean up repo = = = = = = = = = = = = = = = = = = = +rm -rf user_project_wrapper.mag +rm -rf gds/caravel.mag +rm -rf magic_drc.log +git checkout HEAD -- ./mag/user_project_wrapper.mag