[postgis-tickets] [SCM] PostGIS branch stable-3.3 updated. 3.3.3-13-gdd6c40173
git at osgeo.org
git at osgeo.org
Sat Jun 3 22:11:52 PDT 2023
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, stable-3.3 has been updated
via dd6c4017376edaf0e381059e950c58adc283a0f6 (commit)
from 924b50d9e6db7b845562d9689f53d66256fe535a (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 dd6c4017376edaf0e381059e950c58adc283a0f6
Author: Regina Obe <lr at pcorp.us>
Date: Sun Jun 4 01:09:44 2023 -0400
[skip ci] Winnie ci changes. Renable address standardizer and tiger geocoder tests
Default back to json-c 0.12 for packaging and build as well
But allow json-c to be overridable
Note: json-c 0.16 for some reason makes Winnie's cunit break
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index c50538c1c..f7e2d63ee 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -10,13 +10,15 @@ if [[ "${OVERRIDE}" == '' ]] ; then
export ZLIB_VER=1.2.11
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
- export JSON_VER=0.16
+ export JSON_VER=0.12
export PROJSO=libproj-19.dll
fi;
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.16
+if [[ "${JSON_VER}" == '' ]] ; then
+ export JSON_VER=0.12
+fi;
export PCRE_VER=8.33
if [[ "${ICON_VER}" == '' ]] ; then
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 23a59eba8..32ce2bf5c 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -22,14 +22,16 @@ if [[ "${OVERRIDE}" == '' ]] ; then
export ZLIB_VER=1.2.13
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
- export JSON_VER=0.16
+ export JSON_VER=0.12
export PROJSO=libproj-19.dll
export CURL_VER=8.0.1
fi;
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.12
+if [[ "${JSON_VER}" == '' ]] ; then
+ export JSON_VER=0.12
+fi;
export PCRE_VER=8.33
if [[ "${ICON_VER}" == '' ]] ; then
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 13575e411..0ef160335 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -253,14 +253,14 @@ done
make check RUNTESTFLAGS="--extension -v"
##test address standardizer
- #cd ${POSTGIS_SRC}
- #cd extensions/address_standardizer
- #make installcheck
+ cd ${POSTGIS_SRC}
+ cd extensions/address_standardizer
+ make installcheck
##test tiger geocoder
- #cd ${POSTGIS_SRC}
- #cd extensions/postgis_tiger_geocoder
- #make installcheck
+ cd ${POSTGIS_SRC}
+ cd extensions/postgis_tiger_geocoder
+ make installcheck
if [ "$?" != "0" ]; then
exit $?
fi
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/build_postgis.sh | 6 ++++--
ci/winnie/package_postgis.sh | 6 ++++--
ci/winnie/regress_postgis.sh | 12 ++++++------
3 files changed, 14 insertions(+), 10 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list