CI/RLS: upgrade to libspatialindex-2.0.0

Toblerity · Jun 11, 2024 · 2d2aa60 · 2d2aa60
1 parent 6248b6f
commit 2d2aa60
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 245 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,8 @@ jobs:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-        sidx-version: ['1.8.5', '1.9.3']
+        # test oldesst and newest libspatialindex versions
+        sidx-version: ['1.8.5', '2.0.0']
         exclude:
           - os: 'macos-latest'
           - sidx-version: '1.8.5'

diff --git a/ci/CMakeLists.txt b/ci/CMakeLists.txt
diff --git a/ci/install_libspatialindex.bash b/ci/install_libspatialindex.bash
@@ -2,8 +2,8 @@
 set -xe
 
 # A simple script to install libspatialindex from a Github Release
-VERSION=1.9.3
-SHA256=63a03bfb26aa65cf0159f925f6c3491b6ef79bc0e3db5a631d96772d6541187e
+VERSION=2.0.0
+SHA256=8caa4564c4592824acbf63a2b883aa2d07e75ccd7e9bf64321c455388a560579
 
 # where to copy resulting files
 # this has to be run before `cd`-ing anywhere
@@ -53,8 +53,6 @@ cd libspatialindex-${VERSION}
 mkdir build
 cd build
 
-cp "${SL}/CMakeLists.txt" ..
-
 printenv
 
 if [ "$(uname)" == "Darwin" ]; then

diff --git a/ci/install_libspatialindex.bat b/ci/install_libspatialindex.bat
@@ -1,13 +1,11 @@
 python -c "import sys; print(sys.version)"
 
-set SIDX_VERSION=1.9.3
+set SIDX_VERSION=2.0.0
 
 curl -OL "https://github.com/libspatialindex/libspatialindex/archive/%SIDX_VERSION%.zip"
 
 tar xvf "%SIDX_VERSION%.zip"
 
-REM unzip 1.9.3.zip
-REM copy %~dp0\CMakeLists.txt libspatialindex-1.9.3\CMakeLists.txt
 cd libspatialindex-%SIDX_VERSION%
 
 mkdir build