[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-100-ga6bbfd315

Sun Jun 26 13:13:01 PDT 2022

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  a6bbfd31517067559e7e4ff63f9dd614591a8d56 (commit)
       via  f9630828bc9af1ec9b32c12a8d33ad736d8c1809 (commit)
      from  5bcf72d375e162216bb91167e189946d0d4ac1ac (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 a6bbfd31517067559e7e4ff63f9dd614591a8d56
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Jun 26 16:12:56 2022 -0400

    Take out pgmaster since latest is regressing cleanly again

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b3fa7350..5abf48302 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         - { tag: pg13-clang-geos39-gdal31-proj71, mode: usan_clang }
         # Run tests with different dependency combinations
         - { tag: latest, mode: tests }
-        - { tag: pgmaster-geosmain-gdalmaster-proj90, mode: tests }
+        #- { tag: pgmaster-geosmain-gdalmaster-proj90, mode: tests }
         - { tag: pg13-geos38-gdal31-proj71, mode: tests }
         - { tag: pg12-geos37-gdal30-proj611, mode: tests }
         - { tag: pg11-geos37-gdal24-proj52, mode: tests }

commit f9630828bc9af1ec9b32c12a8d33ad736d8c1809
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Jun 26 16:11:35 2022 -0400

    Use 0-byte MAX method for extension scripts

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 70c59e536..dcb932585 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -1,8 +1,7 @@
-#### $Id: package_postgis210.sh 10291 2012-09-15 05:37:23Z robe $
+#!/usr/bin/env bash
 ### this script is used to zip up the compiled binaries
 ## PostgreSQL, OS_BUILD denote the last build to be packaged
 ## and are passed in by the jenkins job process
-## the scp to postgis website is done using Jenkins scp plugin as a final step
 ###
 #export OS_BUILD=64
 #export PGPORT=8442
@@ -16,8 +15,8 @@
 #otherwise use the ones jenkins passes thru
 #!/usr/bin/env bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.10.2
-	export GDAL_VER=3.4.3
+	export GEOS_VER=3.10.3
+	export GDAL_VER=3.4.2
 	export PROJ_VER=7.2.1
 	export SFCGAL_VER=1.4.1
 	export CGAL_VER=5.3
@@ -242,20 +241,50 @@ cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-
 #cp topology/README* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
 #cp utils/* ${RELDIR}/${RELVERDIR}/utils
 #cp extras/* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
-# don't bother shiping old upgrade scripts
-cp ${PGPATH}/share/extension/postgis--ANY*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*--2.3.7*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*--2.4.4*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*--2.4.10*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*--2.5*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*--3*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${RELDIR}/${RELVERDIR}/share/extension
 # in case we ever do MAX ship all the max scripts
 export POSTGIS_MINOR_MAX_VER=${POSTGIS_MINOR_VER}.MAX
-cp ${PGPATH}/share/extension/postgis*${POSTGIS_MINOR_MAX_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
 
-cp ${PGPATH}/share/extension/address_standardizer*--3*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
-cp ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MINOR_MAX_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+#export UPGRADE_VER_FILE="extensions/upgradeable_versions.mk"
+value=$(<extensions/upgradeable_versions.mk)
+export value=${value//\\/}
+value=${value//UPGRADEABLE_VERSIONS = /}
+#echo $value
+export UPGRADEABLE_VERSIONS=$value
+#echo "Versions are:  $UPGRADEABLE_VERSIONS"
+export WIN_RELEASED_VERSIONS="2.0.0 2.0.1 2.0.3 2.0.4 2.0.6 2.1.4 2.1.7 2.1.8 2.2.0 2.2.3 2.3.0 2.3.7 2.4.0 2.4.4"
+for EXTNAME in postgis postgis_raster postgis_topology postgis_sfcgal postgis_tiger_geocoder address_standardizer; do
+	cp extensions/$EXTNAME/sql/$EXTNAME--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+	cp extensions/postgis/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+	cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
+	cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
+
+	# special cases of ANY and next
+	echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--ANY--${POSTGIS_MINOR_MAX_VER}.sql
+	echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}--${POSTGIS_MICRO_VER}next.sql
+
+	if test "$EXTNAME" = "address_standardizer"; then #repeat for address_standardizer_data_us
+		cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+		cp extensions/postgis/sql/postgis--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+		cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension/${EXTNAME}_data_us--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
+		cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
+		echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension//${EXTNAME}_data_us--ANY--${POSTGIS_MINOR_MAX_VER}.sql
+		echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension//${EXTNAME}_data_us--${POSTGIS_MICRO_VER}--${POSTGIS_MINOR_MAX_VER}.sql
+		echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension//${EXTNAME}_data_us--${POSTGIS_MICRO_VER}next--${POSTGIS_MINOR_MAX_VER}.sql
+	fi
+
+	for OLD_VERSION in $UPGRADEABLE_VERSIONS; do \
+		if [ "$OLD_VERSION" > "2.5" ] || [ "$OLD_VERSION" in $WIN_RELEASED_VERSIONS ]; then
+			echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
+			if test "$EXTNAME" = "address_standardizer"; then
+				echo "--placeholder" > ${RELDIR}/${RELVERDIR}/share/extension/${EXTNAME}_data_us--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
+			fi
+		fi
+	done
+done
+#cp ${PGPATH}/share/extension/postgis*--2.5*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+#cp ${PGPATH}/share/extension/postgis*--3*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+#cp ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${RELDIR}/${RELVERDIR}/share/extension
+
 cp -r extensions/*/*.control ${RELDIR}/${RELVERDIR}/share/extension
 cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer in theory has this
 #cp extensions/postgis_topology/sql/* ${RELDIR}/${RELVERDIR}/share/extension

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/ci.yml     |  2 +-
 ci/winnie/package_postgis.sh | 59 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
PostGIS
