[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0beta1-41-ga7c7770d8

Thu Jul 20 00:54:13 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, master has been updated
       via  a7c7770d8c25a2f5194ea0b4a37a9bf9bb1a9ddd (commit)
       via  dc3b6d15396404abdfc61891c68f5eec0105ec0b (commit)
      from  421695b78663211fb7a9f134589a0f9a69c1077f (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 a7c7770d8c25a2f5194ea0b4a37a9bf9bb1a9ddd
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 20 08:53:12 2023 +0200

    [winnie] disable path conversion for all scripts
    
    References #5436
    
    At least one winnie job seems to be using build_postgis.sh
    instead of regress_postgis.sh, I'm not sure this is intentional, but
    this commit should make that one work.
    
    https://winnie.postgis.net/job/PostGIS_2_windows_PGVERSION_winnie/14540/consoleFull
    
    This commit adds a shared file to be sourced by all scripts.
    As a bonus, adds `set -e` to the `package_postgis.sh`, making it stop
    on first failure.

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 94c78010b..3ec9e8411 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+
+. $(dirname $0)/winnie_common.h
+
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.10.2
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 837c724a8..5b6faf08a 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -3,6 +3,9 @@
 ## PostgreSQL, OS_BUILD denote the last build to be packaged
 ## and are passed in by the jenkins job process
 ###
+
+. $(dirname $0)/winnie_common.h
+
 #export OS_BUILD=64
 #export PGPORT=8442
 
@@ -27,6 +30,7 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export CURL_VER=7.73
 fi;
 
+
 export PROTOBUF_VER=3.2.0
 export PROTOBUFC_VER=1.2.1
 export JSON_VER=0.12
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 82122e5e8..99199f441 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+
+. $(dirname $0)/winnie_common.h
+
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.11.0
@@ -19,10 +22,6 @@ export PROTOBUFC_VER=1.2.1
 export JSON_VER=0.12
 export PCRE_VER=8.33
 
-# Don't convert paths
-# See https://trac.osgeo.org/postgis/ticket/5436#comment:5
-export MSYS2_ARG_CONV_EXCL=/config/tags
-
 
 if  [[ "${ICON_VER}" == '' ]] ; then
   export ICON_VER=1.16
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
new file mode 100644
index 000000000..7c9dde5a2
--- /dev/null
+++ b/ci/winnie/winnie_common.sh
@@ -0,0 +1,10 @@
+# Common code for all winnie scripts
+#
+# TODO: add more shared code, I guess
+#
+
+set -e
+
+# Don't convert paths
+# See https://trac.osgeo.org/postgis/ticket/5436#comment:5
+export MSYS2_ARG_CONV_EXCL=/config/tags

commit dc3b6d15396404abdfc61891c68f5eec0105ec0b
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 20 09:49:52 2023 +0200

    Improve robustness of install-upgrade-paths Makefile target
    
     - Do not hide errors on install
     - Improve comment
     - Ensure target dir exists before installing to it
    
    References #5444

diff --git a/extensions/upgrade-paths-rules.mk b/extensions/upgrade-paths-rules.mk
index e543db61c..c87a4e6c2 100644
--- a/extensions/upgrade-paths-rules.mk
+++ b/extensions/upgrade-paths-rules.mk
@@ -6,23 +6,24 @@ PG_SHAREDIR=$(shell $(PG_CONFIG) --sharedir)
 
 install: install-upgrade-paths
 
-# The "next" lines are a cludge to allow upgrading between different
-# revisions of the same version
 #
-# TODO: drop the "next" lines, give users instruction to use:
+# Install <extension>--<curversion>--ANY.sql
+#     and <extension>--ANY--<curversion>.sql
+# upgrade paths
 #
-#   SELECT postgis_extensions_upgrade();
+# The <curversion>--ANY file will be a symlink ( or copy,
+# on systems not supporting symlinks ) to an empty upgrade template
+# file named <extension>--TEMPLATED--TO--ANY.sql and be overwritten
+# by any future versions of PostGIS, keeping the overall number of
+# upgrade paths down.
 #
-# Or:
+# See https://trac.osgeo.org/postgis/ticket/5092
 #
-#   ALTER EXTENSION postgis UPDATE TO 'ANY';
-#   ALTER EXTENSION postgis UPDATE;
-#
-install-upgrade-paths: tag-as-any
-	tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
-	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
-	$(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"; \
-	ln -fs "$(TAG_UPGRADE)" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql;
+install-upgrade-paths: sql/$(TAG_UPGRADE) sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
+	mkdir -p "$(EXTDIR)"
+	$(INSTALL_DATA) "sql/$(EXTENSION)--ANY--$(EXTVERSION).sql" "$(EXTDIR)/$(EXTENSION)--ANY--$(EXTVERSION).sql"
+	$(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"
+	ln -fs "$(TAG_UPGRADE)" "$(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql"
 
 install-extension-upgrades-from-known-versions:
 	$(PERL) $(top_srcdir)/loader/postgis.pl \
@@ -33,8 +34,6 @@ install-extension-upgrades-from-known-versions:
 
 all: sql/$(TAG_UPGRADE)
 
-tag-as-any: sql/$(TAG_UPGRADE)
-
 sql/$(TAG_UPGRADE): $(MAKEFILE_LIST) | sql
 	echo '-- Just tag extension $(EXTENSION) version as "ANY"' > $@
 	echo '-- Installed by $(EXTENSION) $(EXTVERSION)' >> $@

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

Summary of changes:
 ci/winnie/build_postgis.sh        |  3 +++
 ci/winnie/package_postgis.sh      |  4 ++++
 ci/winnie/regress_postgis.sh      |  7 +++----
 ci/winnie/winnie_common.sh        | 10 ++++++++++
 extensions/upgrade-paths-rules.mk | 29 ++++++++++++++---------------
 5 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 ci/winnie/winnie_common.sh


hooks/post-receive
-- 
PostGIS
