[SCM] PostGIS branch master updated. 3.6.0rc2-353-g032bbd623

[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  032bbd6237c705c4c5a3bc53a5e366f62e6d88ab (commit)
      from  13cacae51bf7d39ecb714543bbde04d54c1366ac (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 032bbd6237c705c4c5a3bc53a5e366f62e6d88ab
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Mar 5 13:37:40 2026 +0400

    CI: fix latest builds and improve regression failure logging

diff --git a/.cirrus.yml b/.cirrus.yml
index a7dcf094f..bb9728ac8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -50,7 +50,29 @@ task:
       ccache -s
   test_script:
     - |
-      gmake ${MAKEJOBS} check RUNTESTFLAGS="-v --extension --dumprestore" || { service postgresql onestop; exit 1; }
+      show_regression_diffs() {
+        local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
+        local found=0
+        for f in "${tmpdir}"/*_diff; do
+          [ -f "${f}" ] || continue
+          if [ "${found}" -eq 0 ]; then
+            echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
+          fi
+          found=1
+          echo "---- ${f} ----"
+          cat "${f}"
+        done
+        if [ "${found}" -eq 0 ]; then
+          echo "No regression diff files found in ${tmpdir}"
+        else
+          echo "---- END REGRESSION DIFFS ----"
+        fi
+      }
+      gmake ${MAKEJOBS} check RUNTESTFLAGS="-v --extension --dumprestore" || {
+        show_regression_diffs
+        service postgresql onestop
+        exit 1
+      }
       service postgresql onestop
   freebsd_instance:
     cpu: ${NCPU}
@@ -85,6 +107,25 @@ task:
 
   test_script:
     - |
+      show_regression_diffs() {
+        local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
+        local found=0
+        for f in "${tmpdir}"/*_diff; do
+          [ -f "${f}" ] || continue
+          if [ "${found}" -eq 0 ]; then
+            echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
+          fi
+          found=1
+          echo "---- ${f} ----"
+          cat "${f}"
+        done
+        if [ "${found}" -eq 0 ]; then
+          echo "No regression diff files found in ${tmpdir}"
+        else
+          echo "---- END REGRESSION DIFFS ----"
+        fi
+      }
+
       export PGCONFIG="${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin/pg_config"
       export CFLAGS="-I${HOMEBREW_PREFIX}/opt/gettext/include \
                      -I${HOMEBREW_PREFIX}/opt/postgresql@${PG}/include \
@@ -105,7 +146,11 @@ task:
 
       brew services start postgresql@${PG}
       make -j$(sysctl -n hw.logicalcpu) || { brew services stop postgresql@${PG}; exit 1; }
-      make -j$(sysctl -n hw.logicalcpu) check || { brew services stop postgresql@${PG}; exit 1; }
+      make -j$(sysctl -n hw.logicalcpu) check || {
+        show_regression_diffs
+        brew services stop postgresql@${PG}
+        exit 1
+      }
       brew services stop postgresql@${PG}
 
   macos_cache:
diff --git a/raster/rt_pg/rtpg_geometry.c b/raster/rt_pg/rtpg_geometry.c
index a4059a8bc..5bfd62ad9 100644
--- a/raster/rt_pg/rtpg_geometry.c
+++ b/raster/rt_pg/rtpg_geometry.c
@@ -1572,9 +1572,8 @@ Datum RASTER_asRaster(PG_FUNCTION_ARGS)
 		srs = NULL;
 
 	/* determine number of bands */
-	/* MIN macro is from GDAL's cpl_port.h */
-	num_bands = MIN(pixtypes_len, values_len);
-	num_bands = MIN(num_bands, nodatavals_len);
+	num_bands = Min(pixtypes_len, values_len);
+	num_bands = Min(num_bands, nodatavals_len);
 	POSTGIS_RT_DEBUGF(3, "RASTER_asRaster: pixtypes_len = %d", pixtypes_len);
 	POSTGIS_RT_DEBUGF(3, "RASTER_asRaster: values_len = %d", values_len);
 	POSTGIS_RT_DEBUGF(3, "RASTER_asRaster: nodatavals_len = %d", nodatavals_len);

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

Summary of changes:
 .cirrus.yml                  | 49 ++++++++++++++++++++++++++++++++++++++++++--
 raster/rt_pg/rtpg_geometry.c |  5 ++---
 2 files changed, 49 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS