From 5099567fdf4caab1d2fabcd6451ed2bac2beff38 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Sep 2025 09:20:33 +0800 Subject: [PATCH 1/2] CI: Fix the dvc issue with an access token --- .github/workflows/docs.yml | 6 +++++- .github/workflows/dvc-diff.yml | 8 +++++++- .github/workflows/release-baseline-images.yml | 3 +++ .github/workflows/tests.yml | 6 +++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0125ff0e553..3247846d5b7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -82,7 +82,11 @@ jobs: GH_TOKEN: ${{ github.token }} - name: Pull baseline image data from dvc remote - run: dvc pull --no-run-cache + run: | + dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc pull --no-run-cache + env: + DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} - name: Configure GMT run: | diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml index f2d4f5667f1..f1dcfc528f5 100644 --- a/.github/workflows/dvc-diff.yml +++ b/.github/workflows/dvc-diff.yml @@ -14,6 +14,10 @@ on: paths: - '**/*.dvc' +permissions: + contents: read + pull-requests: write + jobs: dvc-diff: name: DVC image diff @@ -65,7 +69,8 @@ jobs: # Report last updated at commit abcdef - name: Generate the image diff report env: - repo_token: ${{ secrets.GITHUB_TOKEN }} + REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} run: | echo -e "## Summary of changed images\n" > report.md echo -e "This is an auto-generated report of images that have changed on the DVC remote\n" >> report.md @@ -74,6 +79,7 @@ jobs: git fetch origin master # Pull image data from cloud storage + dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull --remote origin dvc pull --remote origin dvc diff --md master HEAD >> report.md diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml index 642c8a121a1..95842e6e705 100644 --- a/.github/workflows/release-baseline-images.yml +++ b/.github/workflows/release-baseline-images.yml @@ -27,8 +27,11 @@ jobs: - name: Pull baseline image data from dvc remote run: | + dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull ls -lhR test/baseline/ + env: + DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} - name: Create the baseline image asset in zip format run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f82ec8b2c2..021f2a0e65c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -122,7 +122,11 @@ jobs: if: runner.os == 'Windows' - name: Pull baseline image data from dvc remote - run: dvc pull --no-run-cache + run: | + dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc pull --no-run-cache + env: + DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} - name: Install GMT run: | From de6bdf3eae48463fc5ce90cb11bc3bfe1e803ba7 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Sep 2025 09:37:27 +0800 Subject: [PATCH 2/2] Fix upstream to origin --- .github/workflows/docs.yml | 2 +- .github/workflows/dvc-diff.yml | 2 +- .github/workflows/release-baseline-images.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3247846d5b7..63e19039f0d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -83,7 +83,7 @@ jobs: - name: Pull baseline image data from dvc remote run: | - dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc remote modify origin url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull --no-run-cache env: DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }} diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml index f1dcfc528f5..13eb9d8f0d9 100644 --- a/.github/workflows/dvc-diff.yml +++ b/.github/workflows/dvc-diff.yml @@ -79,7 +79,7 @@ jobs: git fetch origin master # Pull image data from cloud storage - dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc remote modify origin url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull --remote origin dvc pull --remote origin dvc diff --md master HEAD >> report.md diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml index 95842e6e705..f32f79e5549 100644 --- a/.github/workflows/release-baseline-images.yml +++ b/.github/workflows/release-baseline-images.yml @@ -27,7 +27,7 @@ jobs: - name: Pull baseline image data from dvc remote run: | - dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc remote modify origin url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull ls -lhR test/baseline/ env: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 021f2a0e65c..932bd63ae23 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -123,7 +123,7 @@ jobs: - name: Pull baseline image data from dvc remote run: | - dvc remote modify upstream url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local + dvc remote modify origin url https://${DAGSHUB_TOKEN}@dagshub.com/GenericMappingTools/gmt.dvc --local dvc pull --no-run-cache env: DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }}