wip

Author: robtaylor

.github/workflows/main.yaml

@@ -60,12 +60,16 @@ jobs:
 
   test-submit:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dry: [true, false]
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          path: chipflow-lib
+          path: amaranth-orchard
+
       - name: Check out chipflow-examples
         uses: actions/checkout@v4
         with:
@@ -79,51 +83,36 @@ jobs:
           python-version: "3.10"
           cache: true
           cache-dependency-path: "./**/pyproject.toml"
-      - name: Install dependencies
+
+      - name: Generate overrides to use current branch if PR
         working-directory: ./chipflow-examples
+        if: github.event_name == 'pull_request'
         run: |
-          pdm install
-          pdm run python -m ensurepip
-          pdm run python -m pip install -e ../chipflow-lib
-      - name: Run tests
+          pdm run tools/gen_overrides.py ${{github.head_ref}} > overrides.txt
+          echo "Generated overrides:"
+          cat overrides.txt
+
+      - name: Relock PDM
         working-directory: ./chipflow-examples
-        run: |
-          pdm test
-          pdm run chipflow pin lock
-          pdm run chipflow silicon submit --wait
-        env:
-          CHIPFLOW_API_KEY: ${{ secrets.CHIPFLOW_API_KEY}}
+        if: github.event_name != 'pull_request'
+        run: pdm lock -d
 
-  test-submit-dry:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v4
-        with:
-            fetch-depth: 0
-            path: chipflow-lib
-      - name: Check out chipflow-examples
-        uses: actions/checkout@v4
-        with:
-            repository: ChipFlow/chipflow-examples
-            fetch-depth: 0
-            path: chipflow-examples
+      - name: Relock PDM (PR)
+        working-directory: ./chipflow-examples
+        if: github.event_name == 'pull_request'
+        run: pdm lock -d --override overrides.txt
 
-      - name: Set up PDM
-        uses: pdm-project/setup-pdm@v4
-        with:
-          python-version: "3.10"
-          cache: true
-          cache-dependency-path: "./**/pyproject.toml"
       - name: Install dependencies
         working-directory: ./chipflow-examples
         run: |
           pdm install
           pdm run python -m ensurepip
-          pdm run python -m pip install -e ../chipflow-lib
+          pdm run python -m pip install -e ../amaranth-orchard
       - name: Run tests
         working-directory: ./chipflow-examples
         run: |
           pdm test
           pdm run chipflow pin lock
-          pdm run chipflow silicon submit --dry-run
+          pdm run chipflow silicon submit --wait ${{ if matrix.dry && "--dry-run" }} 
+        env:
+          CHIPFLOW_API_KEY: ${{ secrets.CHIPFLOW_API_KEY}}