[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-82-ga83e783e0

[git at osgeo.org]

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  a83e783e0aa91e99fd279623490adb4fd0a331a7 (commit)
       via  00a73cfc520eafeab38d70289cf47ed3d0335838 (commit)
      from  27974085d757e4f56a4f9a5c9956e40acd403829 (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 a83e783e0aa91e99fd279623490adb4fd0a331a7
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Aug 30 15:27:40 2023 +0200

    Have dronie and woodie test locked upgrade of topology

diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 188bbb451..5d9a737a3 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -32,6 +32,10 @@ RUNTESTFLAGS=-v make check
 RUNTESTFLAGS=-v make check-double-upgrade
 
 RUNTESTFLAGS=-v make -C regress check-locked-upgrade
+RUNTESTFLAGS=-v make -C topology/test check-locked-upgrade
+
+# This is blocked by https://trac.osgeo.org/postgis/ticket/5500
+#RUNTESTFLAGS=-v make -C raster/test/regress check-locked-upgrade
 
 #-----------------------------------------------
 # Install

commit 00a73cfc520eafeab38d70289cf47ed3d0335838
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Aug 30 15:17:43 2023 +0200

    Fix `check-locked-upgrade` for topology

diff --git a/regress/hooks/hook-after-upgrade.sql b/regress/hooks/hook-after-upgrade.sql
index ef6ea0d15..c0516610d 100644
--- a/regress/hooks/hook-after-upgrade.sql
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -8,7 +8,7 @@ DROP VIEW IF EXISTS upgrade_view_test_askml;
 DROP VIEW IF EXISTS upgrade_view_test_dwithin;
 DROP VIEW IF EXISTS upgrade_view_test_clusterkmeans;
 DROP VIEW IF EXISTS upgrade_view_test_distance;
-DROP TABLE upgrade_test;
+DROP TABLE IF EXISTS upgrade_test;
 
 -- Drop any upgrade test data
 DROP SCHEMA IF EXISTS postgis_upgrade_test_data CASCADE;
diff --git a/regress/runtest.mk b/regress/runtest.mk
index aba9a6756..b56632869 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -48,5 +48,7 @@ check-double-upgrade:
 .PHONY: check-locked-upgrade
 check-locked-upgrade:
 	$(MAKE) check-regress \
-    RUNTESTFLAGS="$(RUNTESTFLAGS) --upgrade --before-upgrade-script $(top_srcdir)/regress/hooks/use-all-functions.sql" \
+    RUNTESTFLAGS="$(RUNTESTFLAGS) --upgrade \
+      --before-upgrade-script $(top_srcdir)/regress/hooks/use-all-functions.sql \
+      --after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade.sql " \
     TESTS=$(top_srcdir)/regress/core/regress.sql

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

Summary of changes:
 ci/dronie/postgis_regress.sh         | 4 ++++
 regress/hooks/hook-after-upgrade.sql | 2 +-
 regress/runtest.mk                   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS