[SCM] PostGIS branch master updated. 3.6.0rc2-504-g18d5a182e
git at osgeo.org
git at osgeo.org
Mon Jun 8 07:45:26 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, master has been updated
via 18d5a182ec414673f583da21ac1d9975f19e967d (commit)
via 75870db9056ff0a905df53181e7a42448386d328 (commit)
via 8d491659bd0ed42baedcf96ff3c741611ffa43c4 (commit)
from 65e0811847b3a6572ce496bd219ba69dc62e364f (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 18d5a182ec414673f583da21ac1d9975f19e967d
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date: Mon Jun 8 12:51:30 2026 +0200
build: add FreeBSD docbook-ns xsl path to configure search list
diff --git a/configure.ac b/configure.ac
index fbc92932b..4de164b61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,7 @@ if test "x$XSLBASE" = "x"; then
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
/opt/local/share/xsl/docbook-xsl
/usr/local/opt/docbook-xsl/docbook-xsl
+ /usr/local/share/xsl/docbook-ns
/usr/local/share/xsl/docbook-xsl
/usr/share/xsl/docbook-xsl
"
commit 75870db9056ff0a905df53181e7a42448386d328
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date: Mon Jun 8 12:42:08 2026 +0200
fix(loader): initialize pgfieldlens and pgfieldtypmods to NULL in ShpDumperCreate
diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index 0d6e43486..47d2daf11 100644
--- a/loader/pgsql2shp-core.c
+++ b/loader/pgsql2shp-core.c
@@ -1177,6 +1177,8 @@ ShpDumperCreate(SHPDUMPERCONFIG *config)
state->dbffieldnames = NULL;
state->dbffieldtypes = NULL;
state->pgfieldnames = NULL;
+ state->pgfieldlens = NULL;
+ state->pgfieldtypmods = NULL;
state->message[0] = '\0';
colmap_init(&state->column_map);
commit 8d491659bd0ed42baedcf96ff3c741611ffa43c4
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date: Fri Jun 5 08:07:16 2026 +0200
ci: replace cirrus-ci by github actions
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index bf74e73ba..000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-task:
- # only_if: $CIRRUS_BRANCH =~ 'pull/.*'
- name: FreeBSD
- alias: test-freebsd
- env:
- CIRRUS_CLONE_DEPTH: 1
- CCACHE_DIR: "/tmp/ccache_dir"
- NCPU: 2
- MAKEJOBS: "-j${NCPU}"
- CC: "ccache clang"
- CXX: "ccache clang++"
- CCACHE_MAXSIZE: 1
- CCACHE_COMPRESS: 1
- CCACHE_STATIC_PREFIX: "/usr/local"
- CCACHE_NOSTATS: 1
- CCACHE_TEMPDIR: "/tmp"
- BASEFS: "${CIRRUS_WORKING_DIR}/test_bulk"
- freebsd_cache:
- folder: ${CCACHE_DIR}
- pkg_bootstrap_script:
- - |
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
- ASSUME_ALWAYS_YES=yes pkg bootstrap -f
- pkg_cache:
- folder: /var/cache/pkg
- populate_script:
- pkg fetch -udy autoconf automake bison cunit docbook gdal geos gmake iconv json-c libtool libxml2 libxslt pkgconf postgresql17-contrib postgresql17-server proj protobuf-c sfcgal
- install_pkgs_script:
- - |
- env IGNORE_OSVERSION=yes pkg update -f
- env IGNORE_OSVERSION=yes pkg install -y autoconf automake bison cunit docbook gdal geos gmake iconv json-c libtool libxml2 libxslt pkgconf postgresql17-contrib postgresql17-server proj protobuf-c sfcgal
- projsync --system-directory --source-id us_noaa
- projsync --system-directory --source-id ch_swisstopo
- ccache_setup_script:
- - |
- env IGNORE_OSVERSION=yes pkg install -y ccache-static
- ccache --max-size=${CCACHE_MAXSIZE}
- patch_script:
- - |
- find . -name "*.pl" | xargs sed -i -r 's|/usr/bin/perl|/usr/bin/env perl|'
- build_script:
- - |
- ./autogen.sh
- ./configure PKG_CONFIG=/usr/local/bin/pkgconf CFLAGS="-isystem /usr/local/include -Wall -fno-omit-frame-pointer -Werror" LDFLAGS="-L/usr/local/lib" --with-libiconv-prefix=/usr/local --without-gui --with-topology --without-raster --with-sfcgal=/usr/local/bin/sfcgal-config --with-protobuf
- service postgresql oneinitdb
- service postgresql onestart
- su postgres -c "createuser -s `whoami`"
- gmake ${MAKEJOBS} || { service postgresql onestop; exit 1; }
- gmake ${MAKEJOBS} install || { service postgresql onestop; exit 1; }
- ccache -s
- test_script:
- - |
- show_regression_diffs() {
- local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
- local found=0
- for f in "${tmpdir}"/*_diff; do
- [ -f "${f}" ] || continue
- if [ "${found}" -eq 0 ]; then
- echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
- fi
- found=1
- echo "---- ${f} ----"
- cat "${f}"
- done
- if [ "${found}" -eq 0 ]; then
- echo "No regression diff files found in ${tmpdir}"
- else
- echo "---- END REGRESSION DIFFS ----"
- fi
- }
- gmake ${MAKEJOBS} check RUNTESTFLAGS="-v --extension --dumprestore" || {
- show_regression_diffs
- service postgresql onestop
- exit 1
- }
- service postgresql onestop
- freebsd_instance:
- cpu: ${NCPU}
- memory: 8G
- matrix:
- - name: 14.3-RELEASE
- freebsd_instance:
- image_family: freebsd-14-3
-
-task:
- name: macOS
- alias: test-macos
- macos_instance:
- image: ghcr.io/cirruslabs/macos-runner:sonoma
-
- env:
- CC: "ccache clang"
- CXX: "ccache clang++"
- CCACHE_DIR: "$HOME/.ccache"
- CCACHE_MAXSIZE: 1
- PG: "17"
- HOMEBREW_PREFIX: "/opt/homebrew"
- PATH: "${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:${HOMEBREW_PREFIX}/opt/ccache/libexec:$PATH"
-
- setup_script:
- - |
- brew update
- brew install ccache autoconf automake libtool pkg-config gdal geos icu4c json-c libpq libxml2 proj protobuf-c sfcgal cunit docbook docbook-xsl postgresql@${PG} gettext
- brew link --force gettext
- ccache --max-size=$CCACHE_MAXSIZE
- sudo ln -sfn ${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin/postgres /usr/local/bin/postgres
-
- test_script:
- - |
- show_regression_diffs() {
- local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
- local found=0
- for f in "${tmpdir}"/*_diff; do
- [ -f "${f}" ] || continue
- if [ "${found}" -eq 0 ]; then
- echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
- fi
- found=1
- echo "---- ${f} ----"
- cat "${f}"
- done
- if [ "${found}" -eq 0 ]; then
- echo "No regression diff files found in ${tmpdir}"
- else
- echo "---- END REGRESSION DIFFS ----"
- fi
- }
-
- export PGCONFIG="${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin/pg_config"
- export CFLAGS="-I${HOMEBREW_PREFIX}/opt/gettext/include \
- -I${HOMEBREW_PREFIX}/opt/postgresql@${PG}/include \
- -I${HOMEBREW_PREFIX}/include -Wno-nullability-completeness"
- export LDFLAGS="-L${HOMEBREW_PREFIX}/opt/gettext/lib \
- -L${HOMEBREW_PREFIX}/opt/postgresql@${PG}/lib"
- export CXXFLAGS="-std=c++17"
-
- ./autogen.sh
- ./configure --without-gui \
- --without-interrupt-tests \
- --with-topology \
- --without-raster \
- --with-sfcgal \
- --with-protobuf \
- --with-pgconfig=${PGCONFIG}
-
- brew services start postgresql@${PG}
- make -j$(sysctl -n hw.logicalcpu) || { brew services stop postgresql@${PG}; exit 1; }
- make -j$(sysctl -n hw.logicalcpu) check || {
- show_regression_diffs
- brew services stop postgresql@${PG}
- exit 1
- }
- brew services stop postgresql@${PG}
-
- macos_cache:
- folders: ${CCACHE_DIR}
-
- upload_caches: macos
diff --git a/.github/workflows/ci-freebsd.yml b/.github/workflows/ci-freebsd.yml
new file mode 100644
index 000000000..93f7360fe
--- /dev/null
+++ b/.github/workflows/ci-freebsd.yml
@@ -0,0 +1,119 @@
+# GitHub Actions – FreeBSD CI
+# Replaces .cirrus.yml
+
+name: "CI (FreeBSD)"
+
+on:
+ push:
+ branches-ignore:
+ - 'master'
+ pull_request: ~
+
+jobs:
+
+ freebsd:
+ name: "FreeBSD ${{ matrix.version }}"
+ runs-on: ubuntu-latest
+ env:
+ CCACHE_DIR: "${{ github.workspace }}/.ccache"
+ CCACHE_MAXSIZE: "1G"
+ strategy:
+ fail-fast: false
+ matrix:
+ version:
+ - "14.3"
+ steps:
+ - uses: actions/checkout at 11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ persist-credentials: false
+
+ - name: Cache ccache
+ uses: actions/cache at 27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+ with:
+ path: ${{ env.CCACHE_DIR }}
+ key: freebsd-${{ matrix.version }}-ccache-${{ github.sha }}
+ restore-keys: |
+ freebsd-${{ matrix.version }}-ccache-
+
+ - name: Build and test on FreeBSD
+ uses: vmactions/freebsd-vm at a6de9343ef5747433d9c25784c90e84998b9d69a # v1.4.6
+ with:
+ release: ${{ matrix.version }}
+ usesh: true
+ sync: rsync
+ copyback: true
+ prepare: |
+ sed -i.bak \
+ -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' \
+ /etc/pkg/FreeBSD.conf
+ ASSUME_ALWAYS_YES=yes pkg bootstrap -f
+ env IGNORE_OSVERSION=yes pkg update -f
+ env IGNORE_OSVERSION=yes pkg install -y \
+ autoconf automake bison ccache-static cunit docbook \
+ gdal geos gmake iconv json-c libtool libxml2 libxslt \
+ pkgconf postgresql17-contrib postgresql17-server \
+ proj protobuf-c sfcgal
+ projsync --system-directory --source-id us_noaa
+ projsync --system-directory --source-id ch_swisstopo
+ run: |
+ set -e
+
+ export CC="ccache clang"
+ export CXX="ccache clang++"
+ export CCACHE_DIR="${{ github.workspace }}/.ccache"
+ export CCACHE_MAXSIZE="1G"
+ export CCACHE_COMPRESS=1
+ export CCACHE_STATIC_PREFIX="/usr/local"
+ export CCACHE_NOSTATS=1
+ export CCACHE_TEMPDIR="/tmp"
+ export MAKEJOBS="-j2"
+
+ ccache --max-size="${CCACHE_MAXSIZE}"
+
+ find . -name "*.pl" | xargs sed -i '' 's|/usr/bin/perl|/usr/bin/env perl|'
+
+ ./autogen.sh
+ ./configure \
+ PKG_CONFIG=/usr/local/bin/pkgconf \
+ CFLAGS="-isystem /usr/local/include -Wall -fno-omit-frame-pointer -Werror" \
+ LDFLAGS="-L/usr/local/lib" \
+ --with-libiconv-prefix=/usr/local \
+ --without-gui \
+ --with-topology \
+ --without-raster \
+ --with-sfcgal=/usr/local/bin/sfcgal-config \
+ --with-protobuf
+
+ service postgresql oneinitdb
+ service postgresql onestart
+ su postgres -c "createuser -s $(whoami)"
+
+ gmake ${MAKEJOBS} || { service postgresql onestop; exit 1; }
+ gmake ${MAKEJOBS} install || { service postgresql onestop; exit 1; }
+ ccache -s
+
+ show_regression_diffs() {
+ local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
+ local found=0
+ for f in "${tmpdir}"/*_diff; do
+ [ -f "${f}" ] || continue
+ if [ "${found}" -eq 0 ]; then
+ echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
+ fi
+ found=1
+ echo "---- ${f} ----"
+ cat "${f}"
+ done
+ if [ "${found}" -eq 0 ]; then
+ echo "No regression diff files found in ${tmpdir}"
+ else
+ echo "---- END REGRESSION DIFFS ----"
+ fi
+ }
+
+ gmake ${MAKEJOBS} check RUNTESTFLAGS="-v --extension --dumprestore" || {
+ show_regression_diffs
+ service postgresql onestop
+ exit 1
+ }
+ service postgresql onestop
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
new file mode 100644
index 000000000..27c3cd565
--- /dev/null
+++ b/.github/workflows/ci-macos.yml
@@ -0,0 +1,98 @@
+# GitHub Actions – macOS CI
+# Replaces .cirrus.yml
+
+name: "CI (macOS)"
+
+on:
+ push:
+ branches-ignore:
+ - 'master'
+ pull_request: ~
+
+jobs:
+
+ macos:
+ name: "macOS"
+ runs-on: macos-latest
+ env:
+ PG: "17"
+ HOMEBREW_PREFIX: "/opt/homebrew"
+ CCACHE_DIR: "${{ github.workspace }}/.ccache"
+ CCACHE_MAXSIZE: "1G"
+ steps:
+ - uses: actions/checkout at 11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ persist-credentials: false
+
+ - name: Cache ccache
+ uses: actions/cache at 27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+ with:
+ path: ${{ env.CCACHE_DIR }}
+ key: macos-ccache-${{ github.sha }}
+ restore-keys: |
+ macos-ccache-
+
+ - name: Install dependencies
+ run: |
+ brew update
+ brew install \
+ autoconf automake libtool pkg-config \
+ ccache \
+ gdal geos icu4c json-c libpq libxml2 \
+ proj protobuf-c sfcgal cunit \
+ docbook docbook-xsl \
+ postgresql@${PG} gettext
+ brew link --force gettext
+ ccache --max-size="${CCACHE_MAXSIZE}"
+ sudo ln -sfn "${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin/postgres" /usr/local/bin/postgres
+
+ - name: Build and test
+ env:
+ CC: "ccache clang"
+ CXX: "ccache clang++"
+ run: |
+ export PATH="${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:${HOMEBREW_PREFIX}/opt/ccache/libexec:${PATH}"
+ export PGCONFIG="${HOMEBREW_PREFIX}/opt/postgresql@${PG}/bin/pg_config"
+ export CFLAGS="-I${HOMEBREW_PREFIX}/opt/gettext/include -I${HOMEBREW_PREFIX}/opt/postgresql@${PG}/include -I${HOMEBREW_PREFIX}/include -Wno-nullability-completeness"
+ export LDFLAGS="-L${HOMEBREW_PREFIX}/opt/gettext/lib -L${HOMEBREW_PREFIX}/opt/postgresql@${PG}/lib"
+ export CXXFLAGS="-std=c++17"
+
+ show_regression_diffs() {
+ local tmpdir="${PGIS_REG_TMPDIR:-/tmp/pgis_reg}"
+ local found=0
+ for f in "${tmpdir}"/*_diff; do
+ [ -f "${f}" ] || continue
+ if [ "${found}" -eq 0 ]; then
+ echo "---- BEGIN REGRESSION DIFFS (${tmpdir}) ----"
+ fi
+ found=1
+ echo "---- ${f} ----"
+ cat "${f}"
+ done
+ if [ "${found}" -eq 0 ]; then
+ echo "No regression diff files found in ${tmpdir}"
+ else
+ echo "---- END REGRESSION DIFFS ----"
+ fi
+ }
+
+ ./autogen.sh
+ ./configure \
+ --without-gui \
+ --without-interrupt-tests \
+ --with-topology \
+ --without-raster \
+ --with-sfcgal \
+ --with-protobuf \
+ --with-pgconfig="${PGCONFIG}"
+
+ brew services start "postgresql@${PG}"
+
+ make -j$(sysctl -n hw.logicalcpu) || { brew services stop "postgresql@${PG}"; exit 1; }
+ sudo make install || { brew services stop "postgresql@${PG}"; exit 1; }
+ make -j$(sysctl -n hw.logicalcpu) check RUNTESTFLAGS="-v --extension --dumprestore" || {
+ show_regression_diffs
+ brew services stop "postgresql@${PG}"
+ exit 1
+ }
+ brew services stop "postgresql@${PG}"
diff --git a/make_dist.sh b/make_dist.sh
index 601e62ac0..bda4c2ce4 100755
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -63,7 +63,6 @@ rm -fv "$outdir"/make_dist.sh "$outdir"/HOWTO_RELEASE
echo "Removing ci files"
rm -rfv \
"$outdir"/ci \
- "$outdir"/.cirrus.yml \
"$outdir"/.clang-format \
"$outdir"/.dron*.yml \
"$outdir"/.github \
diff --git a/utils/ci-trac-line.sh b/utils/ci-trac-line.sh
index 744d74324..d0abef4f4 100755
--- a/utils/ci-trac-line.sh
+++ b/utils/ci-trac-line.sh
@@ -17,7 +17,8 @@ cat <<EOF
|| [[Image(https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=bessie32&build=last:\${params.reference=refs/heads/stable-${VER}}, link=https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32, alt=status, height="20", title='PG 10.1(branch), GDAL 2.1 branch, GEOS 3.6')]] || \\
|| [[Image(https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie&build=last:\${params.reference=refs/heads/stable-${VER}}, link=https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie, alt=status, height="20", title='PG 12(branch), GDAL 2.4.0 branch, GEOS 3.7.1')]] || \\
|| [[Image(https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie64&build=last:\${params.reference=refs/heads/stable-${VER}}, link=https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64?build=last:\${params.reference=refs/heads/stable-${VER}, alt=status, height="20", title='PG 12(branch), GDAL 2.4.0 branch, GEOS 3.7.1')]] || \\
-|| [[Image(https://api.cirrus-ci.com/github/postgis/postgis.svg?branch=stable-${VER}, link=https://cirrus-ci.com/github/postgis/postgis, alt=status, height="20", title='PG 13(branch), GDAL 3.5 branch, GEOS 3.12')]] || \\
+|| [[Image(https://github.com/postgis/postgis/actions/workflows/ci-freebsd.yml/badge.svg?branch=stable-${VER}, link=https://github.com/postgis/postgis/actions/workflows/ci-freebsd.yml?query=branch%3Astable-${VER}, alt=status, height="20", title='FreeBSD')]] || \\
+|| [[Image(https://github.com/postgis/postgis/actions/workflows/ci-macos.yml/badge.svg?branch=stable-${VER}, link=https://github.com/postgis/postgis/actions/workflows/ci-macos.yml?query=branch%3Astable-${VER}, alt=status, height="20", title='macOS')]] || \\
|| [[Image(https://gitlab.com/postgis/postgis/badges/stable-${VER}/pipeline.svg, link=https://gitlab.com/postgis/postgis/-/commits/stable-${VER}, alt=status, height="20", title='32/64 bit trixie, PG 15, GDAL 2.4.0, GEOS 3.7.1, PROJ 5.2.0')]] || \\
|| [[Image(https://www.ict.inaf.it/gitlab/postgis/postgis/badges/master/pipeline.svg?ref=refs/heads/${VER}, link=https://www.ict.inaf.it/gitlab/postgis/postgis/-/commits/${VER}, alt=inaf/${VER})]] ||
EOF
-----------------------------------------------------------------------
Summary of changes:
.cirrus.yml | 158 ---------------------------------------
.github/workflows/ci-freebsd.yml | 119 +++++++++++++++++++++++++++++
.github/workflows/ci-macos.yml | 98 ++++++++++++++++++++++++
configure.ac | 1 +
loader/pgsql2shp-core.c | 2 +
make_dist.sh | 1 -
utils/ci-trac-line.sh | 3 +-
7 files changed, 222 insertions(+), 160 deletions(-)
delete mode 100644 .cirrus.yml
create mode 100644 .github/workflows/ci-freebsd.yml
create mode 100644 .github/workflows/ci-macos.yml
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list