Skip to content

Commit 3b306c6

Browse files
authored
Improve the workflow to test both GMT master and 6.1 branches (#554)
1 parent 9bc577f commit 3b306c6

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/ci_tests_dev.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# This workflow installs PyGMT dependencies, builds documentation and runs tests on GMT master
1+
# This workflow installs PyGMT dependencies, builds documentation and runs tests on GMT latest
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
33

4-
name: GMT Master Tests
4+
name: GMT Latest Tests
55

66
on:
77
# push:
@@ -14,13 +14,14 @@ on:
1414

1515
jobs:
1616
test_gmt_master:
17-
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
17+
name: ${{ matrix.os }} - GMT ${{ matrix.gmt_git_ref }}
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
2222
python-version: [3.8]
2323
os: [ubuntu-20.04, macOS-10.15]
24+
gmt_git_ref: [6.1, master]
2425
env:
2526
# LD_LIBRARY_PATH: ${{ github.workspace }}/gmt/lib:$LD_LIBRARY_PATH
2627
GMT_INSTALL_DIR: ${{ github.workspace }}/gmt-install-dir
@@ -54,9 +55,11 @@ jobs:
5455
- name: Install build dependencies
5556
run: conda install cmake libblas libcblas liblapack fftw gdal ghostscript libnetcdf hdf5 zlib curl pcre ipython pytest pytest-cov pytest-mpl
5657

57-
# Install GMT master branch
58-
- name: Install GMT from master
58+
# Build and install latest GMT from GitHub
59+
- name: Install GMT ${{ matrix.gmt_git_ref }} branch
5960
run: curl https://raw.githubusercontent.com/GenericMappingTools/gmt/master/ci/build-gmt.sh | bash
61+
env:
62+
GMT_GIT_REF: ${{ matrix.gmt_git_ref }}
6063

6164
# Download cached remote files (artifacts) from Github
6265
- name: Download remote data from Github

MAINTENANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ There are 3 configuration files located in `.github/workflows`:
5454
This is ran on every commit on the *master* and Pull Request branches.
5555
It is also scheduled to run daily on the *master* branch.
5656

57-
2. `ci_tests_dev.yaml` (GMT Master Tests on Linux/macOS).
57+
2. `ci_tests_dev.yaml` (GMT Latest Tests on Linux/macOS).
5858

5959
This is only triggered when a review is requested or re-requested on a PR.
6060
It is also scheduled to run daily on the *master* branch.

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ PyGMT
1515
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/Tests/badge.svg
1616
:alt: GitHub Actions Tests status
1717
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3ATests
18-
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/GMT%20Master%20Tests/badge.svg
19-
:alt: GitHub Actions GMT Master Tests status
20-
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3A"GMT+Master+Tests"
18+
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/GMT%20Latest%20Tests/badge.svg
19+
:alt: GitHub Actions GMT Latest Tests status
20+
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3A%22GMT+Latest+Tests%22
2121
.. image:: https://img.shields.io/codecov/c/github/GenericMappingTools/pygmt/master.svg?style=flat-square
2222
:alt: Test coverage status
2323
:target: https://codecov.io/gh/GenericMappingTools/pygmt

0 commit comments

Comments
 (0)