[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0beta1-27-g352fe49e9

git at osgeo.org git at osgeo.org
Wed Nov 24 19:58:04 PST 2021 

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  352fe49e965aed08819d7088df9d370714c1f5ec (commit)
      from  dc22c96525af2e276d49fc70a69ccd7e53c91504 (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 352fe49e965aed08819d7088df9d370714c1f5ec
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Nov 24 22:52:19 2021 -0500

    Refactor berrie scripts
    Move shared env variables to configs.sh
    Set to build with custom compiled geos (main branch)
    Turn off garden testing on berries cause it hangs on ST_MaximumInscribed
    References https://trac.osgeo.org/postgis/ticket/5023 for PostGIS 3.2.0

diff --git a/ci/berrie/configs.sh b/ci/berrie/configs.sh
new file mode 100644
index 000000000..ca0a5ca46
--- /dev/null
+++ b/ci/berrie/configs.sh
@@ -0,0 +1,14 @@
+export WORKSPACE=/home/jenkins/workspace
+export GEOS_VER=3.11.0
+
+export OS_BUILD=32
+export PG_VER=14
+export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
+#export GEOS_PATH=~/geos/rel-${GEOS_VER}
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
+export PATH=${PGPATH}/bin:${PGPATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${PATH}
+export PKG_CONFIG_PATH="${GEOS_PATH}/lib/pkgconfig"
+export PGPORT=55433
+export PGDATA=$PGPATH/data_${PGPORT}
+export PGHOST=localhost
+export LD_LIBRARY_PATH="${GEOS_PATH}/lib:${PGPATH}/lib"
diff --git a/ci/berrie/pg_init_start.sh b/ci/berrie/pg_init_start.sh
index 5ade63be5..de42cb9fa 100644
--- a/ci/berrie/pg_init_start.sh
+++ b/ci/berrie/pg_init_start.sh
@@ -1,16 +1,13 @@
+#!/usr/bin/env bash
 #Berrie is a 32-bit Rasberry Pi managed by Bruce Rindahl
 #This is script to launch custom compiled PostgreSQL
 #export label=berrie #this is passed in via Jenkins
-export WORKSPACE=/home/jenkins/workspace
-
-
-
-export OS_BUILD=32
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
-export PGPORT=55432
-export PGDATA=$PGPATH/data_${PGPORT}
+SCRIPT=$(readlink -f "$0")
+export CUR_DIR=$(dirname "$SCRIPT")
+echo $CUR_DIR
+export CONFIG_FILE="$CUR_DIR/configs.sh"
+. $CONFIG_FILE
+echo $PATH
 export PGLOG="$PGDATA/pgsql.log"
 # What to use to start up the postmaster
 DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -o '-F' -l logfile start"
diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index 7c5206a56..88ccd964a 100644
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -4,21 +4,18 @@
 #export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
 ## label is set by jenkins
 #export label=${label}
-
-export WORKSPACE=/home/jenkins/workspace
-
-cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
-export OS_BUILD=32
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-
-export PATH=${PGPATH}/bin:${PGPATH}/lib:${PATH}
-export PGPORT=55432
-export PGDATA=$PGPATH/data_${PGPORT}
-export PGHOST=localhost
+SCRIPT=$(readlink -f "$0")
+export CUR_DIR=$(dirname "$SCRIPT")
+echo $CUR_DIR
+export CONFIG_FILE="$CUR_DIR/configs.sh"
+. $CONFIG_FILE
+echo $PATH
+echo $WORKSPACE
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config --without-protobuf
+./configure --with-pgconfig=${PGPATH}/bin/pg_config \
+  --with-geosconfig=${GEOS_PATH}/bin/geos-config \
+	--without-protobuf
 #make clean
 make
 export err_status=0
diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
new file mode 100644
index 000000000..5a7f90599
--- /dev/null
+++ b/ci/berrie64/configs.sh
@@ -0,0 +1,14 @@
+export WORKSPACE=/home/jenkins/workspace
+export GEOS_VER=3.11.0
+
+export OS_BUILD=64
+export PG_VER=14
+export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
+#export GEOS_PATH=~/geos/rel-${GEOS_VER}
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
+export PATH=${PGPATH}/bin:${PGPATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${PATH}
+export PKG_CONFIG_PATH="${GEOS_PATH}/lib/pkgconfig"
+export PGPORT=55434
+export PGDATA=$PGPATH/data_${PGPORT}
+export PGHOST=localhost
+export LD_LIBRARY_PATH="${GEOS_PATH}/lib:${PGPATH}/lib"
diff --git a/ci/berrie64/pg_init_start.sh b/ci/berrie64/pg_init_start.sh
index 5f7ecb96c..8b855dff3 100644
--- a/ci/berrie64/pg_init_start.sh
+++ b/ci/berrie64/pg_init_start.sh
@@ -1,13 +1,13 @@
+#!/usr/bin/env bash
 #Berrie64 is a 64-bit Rasberry Pi Arm managed by Bruce Rindahl
 #This is script to launch custom compiled PostgreSQL
 #export label=berrie64 #this is passed in via Jenkins
-export WORKSPACE=/home/jenkins/workspace
-
-export OS_BUILD=64
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
-export PGPORT=55432
+SCRIPT=$(readlink -f "$0")
+export CUR_DIR=$(dirname "$SCRIPT")
+echo $CUR_DIR
+export CONFIG_FILE="$CUR_DIR/configs.sh"
+. $CONFIG_FILE
+echo $PATH
 export PGDATA=$PGPATH/data_${PGPORT}
 export PGLOG="$PGDATA/pgsql.log"
 # What to use to start up the postmaster
diff --git a/ci/berrie64/postgis_regress.sh b/ci/berrie64/postgis_regress.sh
index 2b12f5781..5fddfac4d 100644
--- a/ci/berrie64/postgis_regress.sh
+++ b/ci/berrie64/postgis_regress.sh
@@ -1,24 +1,21 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Berrie64 is a 64-bit Rasberry Pi Arm managed by Bruce Rindahl
 ## BRANCH is passed in via jenkins which is set via gitea web hook
 #export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
 ## label is set by jenkins
 #export label=${label}
 
-export WORKSPACE=/home/jenkins/workspace
+SCRIPT=$(readlink -f "$0")
+export CUR_DIR=$(dirname "$SCRIPT")
+echo $CUR_DIR
+export CONFIG_FILE="$CUR_DIR/configs.sh"
+. $CONFIG_FILE
+echo $PATH
 
 cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
-export OS_BUILD=64
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-
-export PATH=${PGPATH}/bin:${PGPATH}/lib:${PATH}
-export PGPORT=55432
-export PGDATA=$PGPATH/data_${PGPORT}
-export PGHOST=localhost
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config
+./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config
 #make clean
 make
 export err_status=0

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

Summary of changes:
 ci/berrie/configs.sh           | 14 ++++++++++++++
 ci/berrie/pg_init_start.sh     | 17 +++++++----------
 ci/berrie/postgis_regress.sh   | 23 ++++++++++-------------
 ci/berrie64/configs.sh         | 14 ++++++++++++++
 ci/berrie64/pg_init_start.sh   | 14 +++++++-------
 ci/berrie64/postgis_regress.sh | 19 ++++++++-----------
 6 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 ci/berrie/configs.sh
 create mode 100644 ci/berrie64/configs.sh


hooks/post-receive
-- 
PostGIS

More information about the postgis-tickets mailing list