Merge pull request #101 from jmckenna/demo-pg3.3

handle PostGIS 3.3 in demo
MapServer · Jul 31, 2023 · 84e7574 · 84e7574
2 parents 1e61f2b + 8617c7d
commit 84e7574
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -9,7 +9,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build
         run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
diff --git a/demo/install.sh.in b/demo/install.sh.in
@@ -11,7 +11,11 @@ PGUSER=postgres
 SHP2PGSQL=@SHP2PGSQL@
 DB=tinyows_demo
 
-if [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
+if [ -d /usr/local/pgsql/share/contrib/postgis-3.3 ]; then
+        PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.3
+elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then
+        PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2
+elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
         PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
 	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0