Add Docker build/push to CI and update workflows for cf-precheck

- publish.yml: add Docker job that builds and pushes to Docker Hub
  after PyPI publish succeeds
- precheck_test.yml: use cf-precheck CLI instead of old mpw_precheck.py
- build-docker.sh: fix org name from efabless to chipfoundry

Made-with: Cursor

Author: marwaneltoukhy

.github/workflows/precheck_test.yml

@@ -1,30 +1,28 @@
-name: MPW Precheck
+name: Precheck CI
 
 on:
   push:
   pull_request:
   workflow_dispatch:
 
 jobs:
-  mpw-precheck:
+  precheck:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - repo: 'caravel_user_project'
-            skip_checks: 'default gpio_defines'
-          # - repo: 'caravel_user_mini'
-          #   skip_checks: ''
+            skip_checks: 'gpio_defines'
           - repo: 'caravel_user_sram'
             skip_checks: 'gpio_defines lvs'
           - repo: 'caravel_user_project_analog'
-            skip_checks: 'default gpio_defines lvs'
+            skip_checks: 'gpio_defines lvs'
           - repo: 'openframe_user_project'
             skip_checks: ''
       fail-fast: false
 
     steps:
-    - name: Checkout chipfoundry/mpw_precheck
+    - name: Checkout mpw_precheck
       uses: actions/checkout@v4
       with:
         repository: chipfoundry/mpw_precheck
@@ -56,7 +54,7 @@ jobs:
           --output type=docker \
           --tag mpw_precheck:latest \
           mpw_precheck/dependencies
-      timeout-minutes: 30  # Increased timeout to 30 minutes
+      timeout-minutes: 30
 
     - name: Move cache
       run: |
@@ -78,41 +76,32 @@ jobs:
       env:
         PDK_ROOT: ${{ github.workspace }}/pdk
 
-    - name: Run MPW Precheck
+    - name: Run Precheck
       run: |
-        export INPUT_DIRECTORY=${{ github.workspace }}/${{ matrix.repo }}
-        export PRECHECK_ROOT=${{ github.workspace }}/mpw_precheck
-        export OUTPUT_DIRECTORY=$INPUT_DIRECTORY/mpw_precheck_result
-        export OUTPUT=$OUTPUT_DIRECTORY/logs/precheck.log
-        export PDK_ROOT=${{ github.workspace }}/pdk
-        export PDKPATH=$PDK_ROOT/sky130A
-        
-        SKIP_CHECKS_ARG=""
+        INPUT_DIR=${{ github.workspace }}/${{ matrix.repo }}
+        OUTPUT_DIR=$INPUT_DIR/precheck_results
+        PDK_ROOT=${{ github.workspace }}/pdk
+        PDK_PATH=$PDK_ROOT/sky130A
+
+        SKIP_ARGS=""
         if [ -n "${{ matrix.skip_checks }}" ]; then
-          SKIP_CHECKS_ARG="--skip_checks ${{ matrix.skip_checks }}"
+          SKIP_ARGS="--skip-checks ${{ matrix.skip_checks }}"
         fi
 
-        docker run -v "$PRECHECK_ROOT":"$PRECHECK_ROOT" \
-                   -v "$INPUT_DIRECTORY":"$INPUT_DIRECTORY" \
-                   -v "$PDK_ROOT":"$PDK_ROOT" \
-                   -e INPUT_DIRECTORY="$INPUT_DIRECTORY" \
-                   -e PDK_ROOT="$PDK_ROOT" \
-                   -e PDKPATH="$PDKPATH" \
-                   -u $(id -u "$USER"):$(id -g "$USER") \
-                   mpw_precheck:latest \
-                   bash -c "cd $PRECHECK_ROOT && python3 mpw_precheck.py --input_directory $INPUT_DIRECTORY --pdk_path $PDKPATH --output_directory $OUTPUT_DIRECTORY --skip_checks $SKIP_CHECKS_ARG"
-
-        if grep -q "All Checks Passed" "$OUTPUT"; then
-          echo "All checks passed for ${{ matrix.repo }}"
-          exit 0
-        else
-          echo "Checks failed for ${{ matrix.repo }}"
-          exit 1
-        fi
+        docker run \
+          -v "$INPUT_DIR":"$INPUT_DIR" \
+          -v "$PDK_ROOT":"$PDK_ROOT" \
+          mpw_precheck:latest \
+          cf-precheck \
+            -i "$INPUT_DIR" \
+            -p "$PDK_PATH" \
+            -c /opt/caravel \
+            -o "$OUTPUT_DIR" \
+            $SKIP_ARGS
 
-    - name: Upload MPW Precheck output
+    - name: Upload Precheck results
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: mpw-precheck-results-${{ matrix.repo }}
-        path: ${{ github.workspace }}/${{ matrix.repo }}/mpw_precheck_result
+        name: precheck-results-${{ matrix.repo }}
+        path: ${{ github.workspace }}/${{ matrix.repo }}/precheck_results

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish Python Package to PyPI
+name: Publish to PyPI and Docker Hub
 
 on:
   push:
@@ -10,9 +10,8 @@ permissions:
   contents: read
 
 jobs:
-  publish:
+  pypi:
     runs-on: ubuntu-latest
-
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -28,10 +27,47 @@ jobs:
         pip install build
 
     - name: Build package
-      run: |
-        python -m build
+      run: python -m build
 
     - name: Publish package to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_TOKEN }}
+
+  docker:
+    needs: pypi
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Wait for PyPI availability
+      run: |
+        VERSION=$(python3 -c "import re; print(re.search(r'\"([^\"]+)\"', open('src/cf_precheck/__init__.py').read()).group(1))")
+        echo "Waiting for cf-precheck==$VERSION on PyPI..."
+        for i in $(seq 1 30); do
+          if pip index versions cf-precheck 2>/dev/null | grep -q "$VERSION"; then
+            echo "cf-precheck $VERSION is available on PyPI"
+            break
+          fi
+          echo "Attempt $i/30 - not yet available, waiting 10s..."
+          sleep 10
+        done
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: dependencies
+        push: true
+        tags: chipfoundry/mpw_precheck:latest
+        cache-from: type=gha
+        cache-to: type=gha,mode=max

dependencies/build-docker.sh

@@ -15,4 +15,4 @@
 
 mkdir -p logs/docker
 echo "dir created"
-docker build --rm -t efabless/mpw_precheck:latest . | tee logs/docker/mpw_precheck.build.txt
+docker build --rm -t chipfoundry/mpw_precheck:latest . | tee logs/docker/mpw_precheck.build.txt