[SCM] PostGIS branch stable-3.3 updated. 3.3.10-71-gc84938029
git at osgeo.org
git at osgeo.org
Sun Jul 19 06:01:19 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.3 has been updated
via c849380298c5a9e6354876f519b999408ab632e0 (commit)
via 4169084fc203230f3f45c4591750d4a16fc25ede (commit)
via 08563a02fe879fc68a88d1d1d11957c9d236e474 (commit)
via eb2c5f3f00617cf22588f3ad10298e0c8893fdf8 (commit)
from 8e49a35f65acf8decad125dfb9f214b559293b09 (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 c849380298c5a9e6354876f519b999408ab632e0
Merge: 8e49a35f6 4169084fc
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sun Jul 19 06:01:18 2026 -0700
Merge pull request 'utils: compare upgrade versions numerically' (!441) from Komzpa/postgis:ci/semver-numeric-3.3-20260719T1138Z into stable-3.3
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/441
commit 4169084fc203230f3f45c4591750d4a16fc25ede
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 16:29:37 2026 +0400
ci: use pg_ctl_options for start timeout
diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index 65ebf5af3..8b4883ec5 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 RUNTESTFLAGS="-v
--after-create-db-script $${CI_WORKSPACE}/regress/hooks/standard-conforming-strings-off.sql"
- export SRCDIR=$${CI_WORKSPACE}
commit 08563a02fe879fc68a88d1d1d11957c9d236e474
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 a3bcd9eb1..65ebf5af3 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 RUNTESTFLAGS="-v
--after-create-db-script $${CI_WORKSPACE}/regress/hooks/standard-conforming-strings-off.sql"
- export SRCDIR=$${CI_WORKSPACE}
commit eb2c5f3f00617cf22588f3ad10298e0c8893fdf8
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 03:55:09 2026 +0400
utils: compare upgrade versions numerically
diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index 207c14c95..4274849ce 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -70,6 +70,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;
@@ -291,6 +301,21 @@ check_all_upgrades_selftest()
exit 1
fi
grep -q '^FAIL: self-test downgrade gave some other error:' ${test_tmp}/other.out
+
+ 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
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/regress.yml | 3 +++
utils/check_all_upgrades.sh | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list