Skip to content

CI: Update for gdal requirement #6268

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
maxrjones merged 2 commits into from
Jan 26, 2022
Merged

CI: Update for gdal requirement #6268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db16d21
CI: Update for gdal requirement
Jan 26, 2022
d234d9b
Merge branch 'master' into ci-req-gdal
Jan 26, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
os: macos-latest
- name: Windows
os: windows-latest
- name: Linux (without GDAL et al.)
- name: Linux (without optional dependencies)
os: ubuntu-latest
EXCLUDE_OPTIONAL : true

Expand Down
4 changes: 2 additions & 2 deletions ci/install-dependencies-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ EXCLUDE_OPTIONAL=${EXCLUDE_OPTIONAL:-false}

# required packages for compiling GMT
packages="build-essential cmake ninja-build libcurl4-gnutls-dev libnetcdf-dev \
ghostscript curl git"
ghostscript curl git libgdal-dev"

# optional packages
if [ "$EXCLUDE_OPTIONAL" = "false" ]; then
packages+=" libgdal-dev libfftw3-dev libpcre3-dev liblapack-dev libglib2.0-dev"
packages+=" libfftw3-dev libpcre3-dev liblapack-dev libglib2.0-dev"
fi

# packages for building documentation
Expand Down
2 changes: 1 addition & 1 deletion ci/vercel-docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -x -e
# Install GMT dependencies
# Vercel uses Amazon Linux 2 (i.e., EPEL 7)
yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
yum install cmake3 ninja-build libcurl-devel netcdf-devel
yum install cmake3 ninja-build libcurl-devel netcdf-devel gdal gdal-devel
# Install Python packages
# importlib-resources is required for Python <3.7
pip install docutils==0.17 sphinx importlib-resources
Expand Down