[SCM] PostGIS branch stable-3.6 updated. 3.6.4-68-g30d2db696
git at osgeo.org
git at osgeo.org
Sun Jul 19 06:00:25 PDT 2026
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 30d2db69622858abc4fdb148d21ec846138df7cf (commit)
via 7a161de934b2791683eb20d9b4280daa67d2f76e (commit)
via fc3ae9a103b682ea90ba292eb81ddb22e029f325 (commit)
via 26dbfb5fc0bdc7517e8bd3887b2c541cac2b061e (commit)
from c05f6583d8c5e4346fe4a9d3740c2c7ca8657fb4 (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 30d2db69622858abc4fdb148d21ec846138df7cf
Merge: c05f6583d 7a161de93
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sun Jul 19 06:00:24 2026 -0700
Merge pull request 'utils: compare upgrade versions numerically' (!438) from Komzpa/postgis:ci/semver-numeric-3.6-20260719T1138Z into stable-3.6
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/438
commit 7a161de934b2791683eb20d9b4280daa67d2f76e
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 16:29:36 2026 +0400
ci: use pg_ctl_options for start timeout
diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index b2013c3fb..eb69bbb24 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -9,7 +9,7 @@ variables:
- export PGPORT=$$(grep ^port /etc/postgresql/$${PGVER}/main/postgresql.conf | awk '{print $$3}')
# The test image can need crash recovery after clone-local startup. Under
# multi-workflow I/O load, Debian's default 60-second pg_ctl wait is short.
- - printf '%s\n' '-t 300' > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
+ - printf '%s\n' "pg_ctl_options = '-t 300'" > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
- export POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
- export RUNTESTFLAGS="-v
--after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql
commit fc3ae9a103b682ea90ba292eb81ddb22e029f325
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 16:03:27 2026 +0400
ci: extend PostgreSQL start timeout
diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index 09504b1e1..b2013c3fb 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -7,6 +7,9 @@ variables:
steps-env: &steps-env
- export PATH=/usr/lib/postgresql/$${PGVER}/bin:$${PATH}
- export PGPORT=$$(grep ^port /etc/postgresql/$${PGVER}/main/postgresql.conf | awk '{print $$3}')
+ # The test image can need crash recovery after clone-local startup. Under
+ # multi-workflow I/O load, Debian's default 60-second pg_ctl wait is short.
+ - printf '%s\n' '-t 300' > /etc/postgresql/$${PGVER}/main/pg_ctl.conf
- export POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
- export RUNTESTFLAGS="-v
--after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql
commit 26dbfb5fc0bdc7517e8bd3887b2c541cac2b061e
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 15:40:32 2026 +0400
utils: compare upgrade versions numerically
diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index 3ebb94b35..012413e75 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -7,6 +7,7 @@ TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/check_all_upgrades.XXXXXX") || exit 1
PGVER=`pg_config --version | awk '{print $2}'`
PGVER_MAJOR=$(echo "${PGVER}" | sed 's/\.[^\.]*//' | sed 's/\(alpha\|beta\|rc\).*//' )
SKIP_LABEL_REGEXP=
+SELFTEST=0
echo "INFO: PostgreSQL version: ${PGVER} [${PGVER_MAJOR}]"
MAKE=$(which gmake make | head -1)
BUILDDIR=$PWD # TODO: allow override ?
@@ -23,11 +24,14 @@ usage() {
echo "Options:"
echo "\t-s Stop on first failure"
echo "\t--skip <regexp> Do not run tests with label matching given extended regexp"
+ echo "\t--self-test Run check_all_upgrades.sh unit tests"
}
while test -n "$1"; do
if test "$1" = "-s"; then
EXIT_ON_FIRST_FAILURE=1
+ elif test "$1" = "--self-test"; then
+ SELFTEST=1
elif test "$1" = "--skip"; then
shift
SKIP_LABEL_REGEXP=$1
@@ -40,7 +44,7 @@ while test -n "$1"; do
shift
done
-if test -z "$to_version_param"; then
+if test "${SELFTEST}" != 1 && test -z "$to_version_param"; then
usage >&2
exit 1
fi
@@ -69,6 +73,16 @@ semver_compare()
echo 1; return;
fi
V2=`echo "$V2" | cut -d. -sf2-`
+ v1_numeric=`echo "$v1" | sed 's/[^0-9].*//'`
+ v2_numeric=`echo "$v2" | sed 's/[^0-9].*//'`
+ if test -n "$v1_numeric" && test -n "$v2_numeric"; then
+ if [ "$v1_numeric" -lt "$v2_numeric" ]; then
+ echo -1; return;
+ fi
+ if [ "$v1_numeric" -gt "$v2_numeric" ]; then
+ echo 1; return;
+ fi
+ fi
# echo "v: $v1 - $v2" >&2
if expr "$v1" '<' "$v2" > /dev/null; then
echo -1; return;
@@ -212,6 +226,29 @@ report_missing_versions()
cleanup
}
+check_all_upgrades_selftest()
+{
+ if test "`semver_compare 3.2.7 3.2.11dev`" != "-1"; then
+ echo "FAIL: expected 3.2.7 to compare older than 3.2.11dev" >&2
+ exit 1
+ fi
+
+ if test "`semver_compare 3.2.11dev 3.2.7`" != "1"; then
+ echo "FAIL: expected 3.2.11dev to compare newer than 3.2.7" >&2
+ exit 1
+ fi
+
+ if test "`semver_compare 3.2.11dev 3.2.11dev`" != "0"; then
+ echo "FAIL: expected identical dev versions to compare equal" >&2
+ exit 1
+ fi
+}
+
+if test "${SELFTEST}" = 1; then
+ check_all_upgrades_selftest
+ exit
+fi
+
to_version=$to_version_param
if expr $to_version : ':auto' >/dev/null; then
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/regress.yml | 3 +++
utils/check_all_upgrades.sh | 39 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list