aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@mines-paris.org>2019-02-27 13:02:01 +0100
committerGitHub <noreply@github.com>2019-02-27 13:02:01 +0100
commit0a78cc67fc06d2fe1769c5582ce5b8b92b1ef4a3 (patch)
treeb8efc7e5dea10abc1937d6b9afa15b7a068cc11e
parentf3e10e2eeb79d1cfd3cb53019d204447baf2d8ac (diff)
parentcb8387fa4d2e0e9cca6dfc3da8f4a6d6aaeb36cb (diff)
downloadPROJ-0a78cc67fc06d2fe1769c5582ce5b8b92b1ef4a3.tar.gz
PROJ-0a78cc67fc06d2fe1769c5582ce5b8b92b1ef4a3.zip
Merge pull request #1297 from rouault/use_grid_18_in_ci
Travis/Appveyor: use proj-datumgrid-1.8
-rw-r--r--appveyor.yml4
-rwxr-xr-xtravis/install.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 728e77c9..a353f8db 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,8 +43,8 @@ test_script:
- echo test_script
- set PROJ_LIB=%PROJ_DIR%\share\proj
- cd %PROJ_LIB%
- - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip
- - 7z e -aoa -y proj-datumgrid-1.7.zip
+ - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.8.zip
+ - 7z e -aoa -y proj-datumgrid-1.8.zip
- cd %PROJ_BUILD%
- ctest -V -C Release
- set PATH=%PATH%;%PROJ_DIR%\bin
diff --git a/travis/install.sh b/travis/install.sh
index f5fa7d08..e37644f4 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -3,7 +3,7 @@
set -e
# Download grid files
-wget http://download.osgeo.org/proj/proj-datumgrid-1.7.zip
+wget http://download.osgeo.org/proj/proj-datumgrid-1.8.zip
# prepare build files
./autogen.sh
@@ -49,7 +49,7 @@ cd ..
cd ../..
# Install grid files
-(cd data && unzip -o ../proj-datumgrid-1.7.zip)
+(cd data && unzip -o ../proj-datumgrid-1.8.zip)
# autoconf build with grids
mkdir build_autoconf_grids