Skip to content

Commit 10fb939

Browse files
committed
Merge branch 'master' into put-vector-text
2 parents 80c1062 + 2ac5a1b commit 10fb939

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/workflows/cache_data.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
@earth_relief_30m_p @earth_relief_30m_g \
3535
@earth_relief_01d_p @earth_relief_01d_g \
3636
@earth_relief_05m_p @earth_relief_05m_g
37+
# Download one tile of the 03s srtm data.
38+
# @N35E135.earth_relief_03s_g.nc is for internal use only.
39+
# The naming scheme may change.
40+
# DO NOT USE IT IN SCRIPTS.
41+
gmt which -Ga @N35E135.earth_relief_03s_g.nc
3742
gmt which -Ga @ridge.txt @Table_5_11.txt @test.dat.nc \
3843
@tut_bathy.nc @tut_quakes.ngdc @tut_ship.xyz \
3944
@usgs_quakes_22.txt

.github/workflows/ci_tests_dev.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ jobs:
7979

8080
# Install build dependencies from conda-forge
8181
- name: Install build dependencies
82-
run: conda install cmake libblas libcblas liblapack fftw gdal ghostscript libnetcdf hdf5 zlib curl pcre ipython pytest pytest-cov pytest-mpl
82+
run: |
83+
conda install ninja cmake libblas libcblas liblapack fftw gdal ghostscript \
84+
libnetcdf hdf5 zlib curl pcre ipython pytest pytest-cov pytest-mpl
8385
8486
# Build and install latest GMT from GitHub
8587
- name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS)

0 commit comments

Comments
 (0)