Skip to content

CI: Fix the DVC Diff workflow for non-main PR base branches #4624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seisman merged 1 commit into from
May 6, 2026
+4 −3
Merged

CI: Fix the DVC Diff workflow for non-main PR base branches #4624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/dvc-diff.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand Down