[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.4-18-g4179657de
git at osgeo.org
git at osgeo.org
Thu Nov 25 18:06:45 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, stable-3.1 has been updated
via 4179657dec003baf9933599768ee8f928f9d974e (commit)
from 77a4e86e2a22432d6bd56b424d8a48517d91f317 (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 4179657dec003baf9933599768ee8f928f9d974e
Author: Regina Obe <lr at pcorp.us>
Date: Thu Nov 25 21:06:40 2021 -0500
Refactor berrie scripts and have test against custom compiled geos 3.10 branch
diff --git a/ci/berrie/configs.sh b/ci/berrie/configs.sh
new file mode 100644
index 000000000..8645f8470
--- /dev/null
+++ b/ci/berrie/configs.sh
@@ -0,0 +1,14 @@
+export WORKSPACE=/home/jenkins/workspace
+export GEOS_VER=3.10.2
+
+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=55432
+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 57721259a..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=13
-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 3f28dbd86..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=13
-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
@@ -27,6 +24,9 @@ make install
make check RUNTESTFLAGS="-v --extension"
err_status=$?
+make garden
+err_status=$?
+
if [ -d $PGDATA/postmaster.pid ] ; then
$PGCTL stop -D $PGDATA -s -m fast
fi
diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
new file mode 100644
index 000000000..501ce1df0
--- /dev/null
+++ b/ci/berrie64/configs.sh
@@ -0,0 +1,14 @@
+export WORKSPACE=/home/jenkins/workspace
+export GEOS_VER=3.10.2
+
+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=55432
+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 9c86bda59..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=13
-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 a176389f0..5182d845e 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=13
-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
@@ -27,9 +24,11 @@ make install
make check RUNTESTFLAGS="-v --extension"
err_status=$?
+
make garden
err_status=$?
+
if [ -d $PGDATA/postmaster.pid ] ; then
$PGCTL stop -D $PGDATA -s -m fast
fi
-----------------------------------------------------------------------
Summary of changes:
ci/berrie/configs.sh | 14 ++++++++++++++
ci/berrie/pg_init_start.sh | 17 +++++++----------
ci/berrie/postgis_regress.sh | 26 +++++++++++++-------------
ci/berrie64/configs.sh | 14 ++++++++++++++
ci/berrie64/pg_init_start.sh | 14 +++++++-------
ci/berrie64/postgis_regress.sh | 21 ++++++++++-----------
6 files changed, 65 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