From f415fdf869505c0ef1ba2c8f6d8e985342e16eea Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 6 May 2026 22:46:41 +0800 Subject: [PATCH] Fix DVC diff base branch selection --- .github/workflows/dvc-diff.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml index 0ead0c5abbc..b8a78726b4e 100644 --- a/.github/workflows/dvc-diff.yml +++ b/.github/workflows/dvc-diff.yml @@ -61,6 +61,7 @@ jobs: - name: Generate the image diff report env: REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_BASE_REF: ${{ github.event.pull_request.base.ref }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} run: | @@ -72,7 +73,7 @@ jobs: # Pull image data from cloud storage dvc pull --remote upstream - dvc diff --md main HEAD >> report.md + dvc diff --md "${PR_BASE_REF}" HEAD >> report.md # Get just the filename of the added and modified image from the report awk 'NF==5 && NR>=7 && $2=="added" {print $4}' report.md > added_files.txt @@ -81,8 +82,8 @@ jobs: # Backup new images in the baseline-new directory mkdir pygmt/tests/baseline-new cp pygmt/tests/baseline/*.png pygmt/tests/baseline-new/ - # Pull images in the main branch from cloud storage - git checkout main + # Pull images in the PR base branch from cloud storage + git checkout "${PR_BASE_REF}" dvc pull --remote upstream --force # Append each image to the markdown report