[SCM] PostGIS branch master updated. 3.7.0beta1-10-g705f2d999

[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  705f2d999f4379b6f37ea03d7d590f6e00d1d191 (commit)
      from  3acbc94c2ea3f6e13744fd7628fe23a217375e0a (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 705f2d999f4379b6f37ea03d7d590f6e00d1d191
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date:   Wed Jul 22 23:22:48 2026 -0700

    ci: stop Berrie PostgreSQL after regressions (!485)
    
    The Berrie/Berrie64 Jenkins scripts were trying to decide whether PostgreSQL was running by testing `$PGDATA/postmaster.pid` as a directory. Berrie64 also had the bracket typo in that test. That means a failed run can leave a PostgreSQL cluster behind, and the next run can be poisoned by stale server state.
    
    This changes those checks to look for a non-empty `postmaster.pid`, quotes the stop/remove/initdb paths while touching those lines, and installs an `EXIT` trap in the regress scripts so `set -e` failures still stop PostgreSQL.
    
    Observed failure this is aimed at: PostGIS_Worker_Run `label=berrie` build 8024 on master failed during the extension raster loader phase with `could not access file "$libdir/postgis_raster-3.7"`, followed by a `psql: not found` cascade, while the source scripts showed the stale-cluster cleanup bug above.
    
    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 style/noise warnings excluded
    
    ---------
    
    Co-authored-by: Darafei Praliaskouski <me at komzpa.net>
    Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/485

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 426cc52d8..8bdffe300 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 \
@@ -32,7 +40,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 01227c641..d9929fe18 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}
@@ -36,7 +44,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