[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0beta1-2-gdf88c3dba
git at osgeo.org
git at osgeo.org
Mon Oct 25 09:29:37 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via df88c3dba84355b44b85d852753bc8459f0a6ebc (commit)
from 3717fd9629d9a5331b377821eabafcf12a4522a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit df88c3dba84355b44b85d852753bc8459f0a6ebc
Author: Regina Obe <lr at pcorp.us>
Date: Mon Oct 25 12:29:31 2021 -0400
Change default for proj to be 7.2.1 (from 7.1.1) and GDAL from 3.2.3 to 3.3.2
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 7b99c5749..cb9b5eb98 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
set -e
if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.9.0
- export GDAL_VER=3.2.0
- export PROJ_VER=7.1.1
+ export GEOS_VER=3.10.0
+ export GDAL_VER=3.3.2
+ export PROJ_VER=7.2.1
export SFCGAL_VER=1.4.0
export CGAL_VER=5.3
export ICON_VER=1.16
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index b6fcd3856..a5487248f 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -16,9 +16,9 @@
#otherwise use the ones jenkins passes thru
#!/usr/bin/env bash
if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.9.1
- export GDAL_VER=3.2.3
- export PROJ_VER=7.1.1
+ export GEOS_VER=3.10.0
+ export GDAL_VER=3.3.2
+ export PROJ_VER=7.2.1
export SFCGAL_VER=1.4.0
export CGAL_VER=5.3
export ICON_VER=1.16
@@ -27,6 +27,7 @@ if [[ "${OVERRIDE}" == '' ]] ; then
export PROTOBUFC_VER=1.2.1
export JSON_VER=0.12
export PROJSO=libproj-19.dll
+ export CURL_VER=7.73
fi;
export PROTOBUF_VER=3.2.0
@@ -40,6 +41,12 @@ fi;
echo "ICON_VER ${ICON_VER}"
+if [[ "${CURL_VER}" == '' ]] ; then
+ export CURL_VER=7.73
+fi;
+
+echo "CURL_VER ${CURL_VER}"
+
#set to something even if override is on but not set
if [[ "${ZLIB_VER}" == '' ]] ; then
export ZLIB_VER=1.2.11
@@ -61,6 +68,7 @@ echo "PROJ_VER $PROJ_VER"
echo "LIBXML_VER $LIBXML_VER"
echo "CGAL_VER $CGAL_VER"
+
export PROJECTS=/projects
export PROJECTS=/projects
export PATHOLD=$PATH
@@ -190,6 +198,7 @@ fi;
echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobuf-c" >> $verfile
+echo "CURL VERSION: ${CURL_VER} https://github.com/protobuf-c/protobuf-c" >> $verfile
cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/
#cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index e4f5d751a..a3fdb16e5 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
set -e
if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.9.1
- export GDAL_VER=3.2.0
- export PROJ_VER=7.1.1
+ export GEOS_VER=3.10.0
+ export GDAL_VER=3.2.3
+ export PROJ_VER=7.2.1
export SFCGAL_VER=1.4.0
export CGAL_VER=5.3.0
export ICON_VER=1.15
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/build_postgis.sh | 6 +++---
ci/winnie/package_postgis.sh | 15 ++++++++++++---
ci/winnie/regress_postgis.sh | 6 +++---
3 files changed, 18 insertions(+), 9 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list