Skip to content
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

Improve the workflow to test both GMT master and 6.1 branches #554

Merged
merged 3 commits into from
Aug 6, 2020
Merged

Improve the workflow to test both GMT master and 6.1 branches #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1639d5
Improve the workflow to test both GMT master and 6.1 branches
seisman Aug 6, 2020
251a9f4
Fix README badge and step names
seisman Aug 6, 2020
d6c8659
Fix the workflow name in MAINTENANCE.md
seisman Aug 6, 2020
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
13 changes: 8 additions & 5 deletions .github/workflows/ci_tests_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow installs PyGMT dependencies, builds documentation and runs tests on GMT master
# This workflow installs PyGMT dependencies, builds documentation and runs tests on GMT latest
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: GMT Master Tests
name: GMT Latest Tests

on:
# push:
Expand All @@ -14,13 +14,14 @@ on:

jobs:
test_gmt_master:
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
name: ${{ matrix.os }} - GMT ${{ matrix.gmt_git_ref }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [3.8]
os: [ubuntu-20.04, macOS-10.15]
gmt_git_ref: [6.1, master]
env:
# LD_LIBRARY_PATH: ${{ github.workspace }}/gmt/lib:$LD_LIBRARY_PATH
GMT_INSTALL_DIR: ${{ github.workspace }}/gmt-install-dir
Expand Down Expand Up @@ -54,9 +55,11 @@ jobs:
- name: Install build dependencies
run: conda install cmake libblas libcblas liblapack fftw gdal ghostscript libnetcdf hdf5 zlib curl pcre ipython pytest pytest-cov pytest-mpl

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

# Download cached remote files (artifacts) from Github
- name: Download remote data from Github
Expand Down
2 changes: 1 addition & 1 deletion MAINTENANCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ There are 3 configuration files located in `.github/workflows`:
This is ran on every commit on the *master* and Pull Request branches.
It is also scheduled to run daily on the *master* branch.

2. `ci_tests_dev.yaml` (GMT Master Tests on Linux/macOS).
2. `ci_tests_dev.yaml` (GMT Latest Tests on Linux/macOS).

This is only triggered when a review is requested or re-requested on a PR.
It is also scheduled to run daily on the *master* branch.
Expand Down
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ PyGMT
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/Tests/badge.svg
:alt: GitHub Actions Tests status
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3ATests
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/GMT%20Master%20Tests/badge.svg
:alt: GitHub Actions GMT Master Tests status
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3A"GMT+Master+Tests"
.. image:: https://github.com/GenericMappingTools/pygmt/workflows/GMT%20Latest%20Tests/badge.svg
:alt: GitHub Actions GMT Latest Tests status
:target: https://github.com/GenericMappingTools/pygmt/actions?query=workflow%3A%22GMT+Latest+Tests%22
.. image:: https://img.shields.io/codecov/c/github/GenericMappingTools/pygmt/master.svg?style=flat-square
:alt: Test coverage status
:target: https://codecov.io/gh/GenericMappingTools/pygmt
Expand Down