more moving of variables to script from job

git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16274 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ci/debbie/postgis_regress.sh b/ci/debbie/postgis_regress.sh
index 7f24db8b22fb24f8490d478a25748cea1590bb31..1e63f8d3dfc0c1a08a70546c8784f24af78db2f2 100644 (file)
--- a/ci/debbie/postgis_regress.sh
+++ b/ci/debbie/postgis_regress.sh
@@ -9,11 +9,11 @@ set -e
 # 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 $PGPORT
 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 @@ fi
     --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 $?

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index adb768005a195f9a253ccb5a8eaad201c9b215d3..76c4c6fc601b3595dc6465cf64a2d0e031c008be 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -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