Skip to content

Pull dvc baseline images from gmt-6.4 branch to test GMT dev #1865

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 4 commits into from
Apr 14, 2022
Merged

Pull dvc baseline images from gmt-6.4 branch to test GMT dev #1865

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6253f06
Pull dvc baseline images from side-branch to test GMT dev
weiji14 Apr 3, 2022
62575aa
Checkout gmt-6.4 branch instead of update-baseline-images-for-gmt-dev
weiji14 Apr 12, 2022
333c1d6
Update comment about pulling down from gmt-6.4 branch
weiji14 Apr 12, 2022
49ae401
Merge branch 'main' into test/gmt-dev-side-branch
seisman Apr 14, 2022
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
5 changes: 5 additions & 0 deletions .github/workflows/ci_tests_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,13 @@ jobs:
# Pull baseline image data from dvc remote (DAGsHub)
- name: Pull baseline image data from dvc remote
run: |
ORIGINAL_BRANCH=$(git branch --show-current)
# Pull down GMT 6.4 baseline images from
# https://github.com/GenericMappingTools/pygmt/pull/1791
Comment thread
weiji14 marked this conversation as resolved.
Outdated
git checkout update-baseline-images-for-gmt-dev
Comment thread
weiji14 marked this conversation as resolved.
Outdated
dvc pull
ls -lhR pygmt/tests/baseline/
git checkout ${ORIGINAL_BRANCH}
Comment on lines +101 to +114

@seisman seisman Apr 12, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if we should have a gmt-6.4 or a more general gmt-dev branch.

So changes in #1791 can be merged into the gmt-dev branch and the ci_tests_dev workflow can test the gmt-dev branch instead.

Of course, we need to keep the gmt-dev branch up-to-date with the main branch, either manually or via workflow.

@weiji14 weiji14 Apr 12, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if we should have a gmt-6.4 or a more general gmt-dev branch.

A gmt-6.4 branch sounds good, best not to have a very long-running branch like gmt-dev to avoid scrolling down so much in a PR.

So changes in #1791 can be merged into the gmt-dev branch and the ci_tests_dev workflow can test the gmt-dev branch instead.

Of course, we need to keep the gmt-dev branch up-to-date with the main branch, either manually or via workflow.

Let's start with manual for now, and if things break very often, we can have a scheduled cron job to update the gmt-6.4 branch every week or so.

@seisman seisman Apr 12, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created the gmt-6.4 branch (https://github.com/GenericMappingTools/pygmt/tree/gmt-6.4).


# Build and install latest GMT from GitHub
- name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS)
Expand Down