From b790d133804b37c43507d6550d9c0e9f6b8dbb24 Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Mon, 23 Jun 2025 12:01:08 +0100 Subject: [PATCH 1/2] Make test-examples workflow check the base ref as well for a PR --- .github/workflows/test-examples.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-examples.yml b/.github/workflows/test-examples.yml index d55fc375..2358ba08 100644 --- a/.github/workflows/test-examples.yml +++ b/.github/workflows/test-examples.yml @@ -40,7 +40,15 @@ jobs: if: github.event_name == 'pull_request' run: | git remote update - git checkout ${{ github.head_ref }} || echo "Falling back to main" + git checkout ${{ github.head_ref }} || echo "${{github.head_ref}} not found, checking base ${{github.base_ref}}" + + - name: Check for branch ${{ github.base_ref }} + working-directory: ${{ env.test_repo_path }} + if: github.event_name == 'pull_request' + run: | + git remote update + git checkout ${{ github.base_ref }} || echo "${{github.base_ref}} not found Falling back to main" + - name: Set up PDM uses: pdm-project/setup-pdm@v4 From 489dfacb79bb7dd62720dd619b59d5fe3e668274 Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Mon, 23 Jun 2025 12:08:03 +0100 Subject: [PATCH 2/2] Use pdm-multirepo v3 --- .github/workflows/coverage.yml | 2 +- .github/workflows/main.yaml | 2 +- .github/workflows/preview-docs.yml | 2 +- .github/workflows/test-examples.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 48119ff1..b91aab83 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -24,7 +24,7 @@ jobs: cache: true - name: Install dependencies with multirepo - uses: chipflow/pdm-multirepo@v1 + uses: chipflow/pdm-multirepo@v3 - name: Build coverage file run: | diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9f086125..bbdc5260 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -22,7 +22,7 @@ jobs: cache: true - name: Install dependencies with multirepo - uses: chipflow/pdm-multirepo@v1 + uses: chipflow/pdm-multirepo@v3 - name: Run tests run: pdm run test diff --git a/.github/workflows/preview-docs.yml b/.github/workflows/preview-docs.yml index 152c2422..13a643b7 100644 --- a/.github/workflows/preview-docs.yml +++ b/.github/workflows/preview-docs.yml @@ -20,7 +20,7 @@ jobs: cache: true - name: Install dependencies with multirepo - uses: chipflow/pdm-multirepo@v1 + uses: chipflow/pdm-multirepo@v3 - name: Build docs run: pdm docs diff --git a/.github/workflows/test-examples.yml b/.github/workflows/test-examples.yml index 2358ba08..8b5d1f73 100644 --- a/.github/workflows/test-examples.yml +++ b/.github/workflows/test-examples.yml @@ -58,7 +58,7 @@ jobs: cache-dependency-path: './**/pyproject.toml' - name: Install dependencies with multirepo - uses: chipflow/pdm-multirepo@v1 + uses: chipflow/pdm-multirepo@v3 with: working-directory: ${{ env.test_repo_path }}