[postgis-tickets] r16274 - more moving of variables to script from job

[Regina Obe]

Author: robe
Date: 2018-01-12 07:38:47 -0800 (Fri, 12 Jan 2018)
New Revision: 16274

Modified:
   branches/2.4/ci/debbie/postgis_regress.sh
   branches/2.4/ci/winnie/package_postgis.sh
Log:
more moving of variables to script from job

Modified: branches/2.4/ci/debbie/postgis_regress.sh
===================================================================
--- branches/2.4/ci/debbie/postgis_regress.sh	2018-01-12 15:25:34 UTC (rev 16273)
+++ branches/2.4/ci/debbie/postgis_regress.sh	2018-01-12 15:38:47 UTC (rev 16274)
@@ -9,11 +9,11 @@
 # export POSTGIS_MINOR_VERSION=2
 # export POSTGIS_MICRO_VERSION=0dev
 # export JENKINS_HOME=/var/lib/jenkins/workspace
-# export GEOS_VER=3.6.0dev
-# export GDAL_VER=2.0
-# export MAKE_GARDEN=1
-# export MAKE_EXTENSION=0
-# export DUMP_RESTORE=1
+export GEOS_VER=3.6.1
+export GDAL_VER=2.2.2
+export MAKE_GARDEN=0
+export MAKE_EXTENSION=1
+export DUMP_RESTORE=0
 
 ## end variables passed in by jenkins
 
@@ -33,7 +33,7 @@
 echo ${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 
 ## doesn't work for some reason - just hard-code to branches for now
-# if [[ $POSTGIS_MICRO_VERSION  == *SVN* || $POSTGIS_MICRO_VERSION  == *dev*  ]]  
+# if [[ $POSTGIS_MICRO_VERSION  == *SVN* || $POSTGIS_MICRO_VERSION  == *dev*  ]]
 # then
 # 	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 # else
@@ -59,7 +59,7 @@
     --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 make clean
 ## install so we can later test extension upgrade
-make 
+make
 
 if [ "$?" != "0" ]; then
   exit $?

Modified: branches/2.4/ci/winnie/package_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/package_postgis.sh	2018-01-12 15:25:34 UTC (rev 16273)
+++ branches/2.4/ci/winnie/package_postgis.sh	2018-01-12 15:38:47 UTC (rev 16274)
@@ -9,7 +9,7 @@
 #POSTGIS_MAJOR_VERSION=2
 #POSTGIS_MINOR_VERSION=1
 #POSTGIS_MICRO_VERSION=0dev
-export GEOS_VER=3.7.0dev
+export GEOS_VER=3.6.2
 export GDAL_VER=2.2.2
 export PROJ_VER=4.9.3
 export SFCGAL_VER=1.3