[SCM] PostGIS branch master updated. 3.5.0alpha2-6-g5d5ed3b14

[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  5d5ed3b148d8d647eabaea6ea41c377dee674832 (commit)
      from  6c135f9ca3a9b60889eae2bc2adc67350e0c0e4a (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 5d5ed3b148d8d647eabaea6ea41c377dee674832
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Jul 10 13:40:01 2024 -0400

    Put back topology tests, CI changes
    but disable topology extension regress on winnie
    References #5727 for PostGIS 3.5.0
    Have tools.yml also use repo.osgeo.org instead of docker.osgeo.org

diff --git a/.woodpecker/tools.yml b/.woodpecker/tools.yml
index df9b86dfd..6a8bd160c 100644
--- a/.woodpecker/tools.yml
+++ b/.woodpecker/tools.yml
@@ -2,7 +2,7 @@ when:
   event: [push, pull_request, tag]
 steps:
   build:
-    image: docker.osgeo.org/postgis/build-test:trisquel11
+    image: repo.osgeo.org/postgis/build-test:trisquel11
     pull: true
     commands:
       - sh ci/dronie/postgis_tools.sh
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 4bcf71ba4..6a9b528cd 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -78,7 +78,8 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/lib -L${PROJECTS
   --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-gui --with-gettext=no \
   --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
-  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version
+  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version \
+  --without-topology
   #exit
 else
 LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/bin -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
@@ -89,7 +90,8 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/bin -L${PROJECTS
   --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-gui --with-gettext=no \
   --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
-  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
+  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} \
+  --without-topology
 fi;
 
 
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index fa6b9b49a..cbe263369 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -74,6 +74,7 @@ TESTS += \
 	$(top_srcdir)/topology/test/regress/topoelementarray_agg.sql \
 	$(top_srcdir)/topology/test/regress/topoelement_cast.sql \
 	$(top_srcdir)/topology/test/regress/topoelement.sql \
+	$(top_srcdir)/topology/test/regress/topogeo_addlinestring_robust.sql \
 	$(top_srcdir)/topology/test/regress/topogeo_addlinestring.sql \
 	$(top_srcdir)/topology/test/regress/topogeo_addpoint_merge_edges.sql \
 	$(top_srcdir)/topology/test/regress/topogeo_addpoint.sql \

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

Summary of changes:
 .woodpecker/tools.yml        | 2 +-
 ci/winnie/regress_postgis.sh | 6 ++++--
 topology/test/tests.mk       | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS