[SCM] PostGIS branch stable-3.6 updated. 3.6.4-85-gebf8f43a5

[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, stable-3.6 has been updated
       via  ebf8f43a55c86b1f6b1fab1ccac1ca04c262404a (commit)
      from  4d17da017d2269263f8c77cc5218b4a58c022fd3 (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 ebf8f43a55c86b1f6b1fab1ccac1ca04c262404a
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date:   Wed Jul 22 23:23:02 2026 -0700

    ci: stop Berrie PostgreSQL after regressions (!486)
    
    Companion/backport of the Berrie/Berrie64 Jenkins cleanup from master PR #485 for `stable-3.6`.
    
    stable-3.6 currently has a stale-fail Berrie worker row on build 8009, and this branch has the same cleanup bug as master.
    
    The Berrie scripts were testing `$PGDATA/postmaster.pid` as a directory, and Berrie64 also had the bracket typo in that test. The regress scripts use `set -e`, so failures could skip the final shutdown and leave stale PostgreSQL state for the next worker run.
    
    This patch changes the running-cluster check to a non-empty `postmaster.pid`, keeps the branch-specific stable script lines, and adds an `EXIT` trap so failed regressions still stop PostgreSQL.
    
    Checks:
    
    - `bash -n ci/berrie/pg_init_start.sh ci/berrie/postgis_regress.sh ci/berrie64/pg_init_start.sh ci/berrie64/postgis_regress.sh`
    - `git diff --check`
    - `shellcheck` with the pre-existing Jenkins-script style/noise warnings excluded
    
    ---------
    
    Co-authored-by: Darafei Praliaskouski <me at komzpa.net>
    Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/486

diff --git a/ci/berrie/pg_init_start.sh b/ci/berrie/pg_init_start.sh
index 759930391..f17399176 100644
--- a/ci/berrie/pg_init_start.sh
+++ b/ci/berrie/pg_init_start.sh
@@ -16,16 +16,16 @@ DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -o '-F' -l logfile start"
 PGCTL="$PGPATH/bin/pg_ctl"
 
 # remove cluster if exists
-if [ -d $PGDATA ] ; then
-    if [ -d $PGDATA/postmaster.pid ] ; then
-    	$PGCTL stop -D $PGDATA -s -m fast
+if [ -d "$PGDATA" ] ; then
+    if test -s "$PGDATA/postmaster.pid" ; then
+        "$PGCTL" stop -D "$PGDATA" -s -m fast
     fi;
 
-    rm -rf $PGDATA
+    rm -rf "$PGDATA"
 fi;
 
 #initialize cluster
-$PGPATH/bin/initdb
+"$PGPATH/bin/initdb"
 
 echo -n "Starting PostgreSQL: "
 $DAEMON &
diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index dda1678f5..50c837300 100644
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -13,6 +13,14 @@ export CONFIG_FILE="$CUR_DIR/configs.sh"
 echo $PATH
 echo $WORKSPACE
 
+pg_stop()
+{
+	if [ -n "${PGDATA:-}" ] && test -s "${PGDATA}/postmaster.pid"; then
+		"${PGPATH}/bin/pg_ctl" stop -D "${PGDATA}" -s -m fast || true
+	fi
+}
+trap pg_stop EXIT
+
 sh autogen.sh
 ./configure --with-pgconfig=${PGPATH}/bin/pg_config \
   --with-geosconfig=${GEOS_PATH}/bin/geos-config \
@@ -31,7 +39,4 @@ err_status=$?
 #make garden
 #err_status=$?
 
-if [ -d $PGDATA/postmaster.pid ] ; then
-	$PGCTL stop -D $PGDATA -s -m fast
-fi
 exit $err_status
diff --git a/ci/berrie64/pg_init_start.sh b/ci/berrie64/pg_init_start.sh
index 2a295d119..7e0c4cd5f 100644
--- a/ci/berrie64/pg_init_start.sh
+++ b/ci/berrie64/pg_init_start.sh
@@ -17,16 +17,16 @@ DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -o '-F' -l logfile start"
 PGCTL="$PGPATH/bin/pg_ctl"
 
 # remove cluster if exists
-if [ -d $PGDATA ] ; then
-    if [ -d $PGDATA/postmaster.pid] ; then
-    	$PGCTL stop -D $PGDATA -s -m fast
+if [ -d "$PGDATA" ] ; then
+    if test -s "$PGDATA/postmaster.pid" ; then
+        "$PGCTL" stop -D "$PGDATA" -s -m fast
     fi;
 
-    rm -rf $PGDATA
+    rm -rf "$PGDATA"
 fi;
 
 #initialize cluster
-$PGPATH/bin/initdb
+"$PGPATH/bin/initdb"
 
 echo -n "Starting PostgreSQL: "
 $DAEMON &
diff --git a/ci/berrie64/postgis_regress.sh b/ci/berrie64/postgis_regress.sh
index 35221bb3d..7bbd3dd69 100644
--- a/ci/berrie64/postgis_regress.sh
+++ b/ci/berrie64/postgis_regress.sh
@@ -13,6 +13,14 @@ export CONFIG_FILE="$CUR_DIR/configs.sh"
 . $CONFIG_FILE
 echo $PATH
 
+pg_stop()
+{
+	if [ -n "${PGDATA:-}" ] && test -s "${PGDATA}/postmaster.pid"; then
+		"${PGPATH}/bin/pg_ctl" stop -D "${PGDATA}" -s -m fast || true
+	fi
+}
+trap pg_stop EXIT
+
 sh autogen.sh
 ./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version \
     --without-interrupt-tests --prefix=${PGPATH}
@@ -33,7 +41,4 @@ utils/check_all_upgrades.sh \
 
 err_status=$?
 
-if [ -d $PGDATA/postmaster.pid ] ; then
-	$PGCTL stop -D $PGDATA -s -m fast
-fi
 exit $err_status

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

Summary of changes:
 ci/berrie/pg_init_start.sh     | 10 +++++-----
 ci/berrie/postgis_regress.sh   | 11 ++++++++---
 ci/berrie64/pg_init_start.sh   | 10 +++++-----
 ci/berrie64/postgis_regress.sh | 11 ++++++++---
 4 files changed, 26 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
PostGIS