From 43028e5a1e09baee2555d9205e100fd6af24bb46 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Apr 2022 22:39:45 +0800 Subject: [PATCH 1/2] Pull baseline images from the gmt-6.4 branch only for scheduled jobs --- .github/workflows/ci_tests_dev.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 3d829607ea6..8c6c771a654 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -106,6 +106,7 @@ jobs: # Pull baseline image data from dvc remote (DAGsHub) - name: Pull baseline image data from dvc remote + if: github.event_name == 'schedule' run: | ORIGINAL_BRANCH=$(git branch --show-current) # Pull down GMT 6.4 baseline images from the gmt-6.4 branch @@ -114,6 +115,13 @@ jobs: ls -lhR pygmt/tests/baseline/ git checkout ${ORIGINAL_BRANCH} + # Pull baseline image data from dvc remote (DAGsHub) + - name: Pull baseline image data from dvc remote + if: github.event_name != 'schedule' + run: | + dvc pull + ls -lhR pygmt/tests/baseline/ + # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) run: curl https://raw.githubusercontent.com/GenericMappingTools/gmt/master/ci/build-gmt.sh | bash From 18bec1a24b07dd747b760bb3300ef0cf5d007bbf Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 16 Apr 2022 12:09:43 +0800 Subject: [PATCH 2/2] Update comment --- .github/workflows/ci_tests_dev.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 8c6c771a654..f2eea37d2fe 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -110,6 +110,7 @@ jobs: run: | ORIGINAL_BRANCH=$(git branch --show-current) # Pull down GMT 6.4 baseline images from the gmt-6.4 branch + # https://github.com/GenericMappingTools/pygmt/pull/1883 git checkout gmt-6.4 dvc pull ls -lhR pygmt/tests/baseline/