[SCM] PostGIS branch master updated. 3.4.0rc1-743-g5375fbef8

git at osgeo.org git at osgeo.org
Thu Nov 2 05:08:45 PDT 2023


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  5375fbef86e47b478623689b43f5458134a8149a (commit)
      from  6adb29e43b5514be567c4f91b43c635ad9163948 (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 5375fbef86e47b478623689b43f5458134a8149a
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Sep 7 11:53:42 2023 +0200

    [woodie] Stop using ci/dronie/postgis_regress.sh
    
    Uses a multi-step approach to have logs better organized.
    
    Ideally we would not need to do this but upstream does not
    support better organization of logs at the moment, see:
    https://github.com/woodpecker-ci/woodpecker/discussions/2263

diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index c0bbe64ca..dab9e0885 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -1,5 +1,44 @@
 variables:
   test-image: &test-image docker.osgeo.org/postgis/build-test:trisquel3
+  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}')
+    - export POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
+    - export RUNTESTFLAGS="-v --after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql"
+    - export SRCDIR=$${CI_WORKSPACE}
+    - export BUILDDIR=$${SRCDIR}/build/pg$${PGVER}
+    - export CURRENTVERSION=$$(grep '^POSTGIS_' $${SRCDIR}/Version.config | cut -d= -f2 | paste -sd '.')
+    - pg_config --version
+  steps-start-postgresql: &steps-start-postgresql
+    - service postgresql start $${PGVER}
+    - psql -c 'select version()' template1
+  steps-pg-build: &steps-pg-build
+    - mkdir -p "$${BUILDDIR}"
+    - cd "$${BUILDDIR}"
+    - $${SRCDIR}/configure
+      --with-library-minor-version
+      --enable-lto
+      --enable-lto
+      CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror"
+    - make -j
+  steps-pg-test-preinstall: &steps-pg-test-preinstall
+    - cd build/pg$${PGVER}
+    - make check
+    - make check-double-upgrade
+    - make check-locked-upgrade
+  steps-pg-install: &steps-pg-install
+    - make -C build/pg$${PGVER} install
+  steps-pg-test-install: &steps-pg-test-install
+    - service postgresql start $${PGVER}
+    - make -C build/pg$${PGVER} installcheck
+  steps-pg-test-all-upgrades: &steps-pg-test-all-upgrades
+    - cd build/pg$${PGVER}
+    - mkfifo check.fifo
+    - tee check.log < check.fifo &
+    - $${SRCDIR}/utils/check_all_upgrades.sh -s $${CURRENTVERSION}! > check.fifo
+    - wait # for tee process to flush its buffers
+    - echo "-- Summary of upgrade tests --"
+    - egrep '(PASS|FAIL|SKIP|INFO|ERROR)' check.log
 
 clone:
   clone:
@@ -14,22 +53,86 @@ steps:
     commands:
       - ./autogen.sh
 
-  regress-pg12:
+  build-pg12:
     image: *test-image
     group: build
     environment:
       - PGVER=12
-      - POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
-      - RUNTESTFLAGS=--after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql
     commands:
-      - sh ci/dronie/postgis_regress.sh
+      - <<: *steps-env
+      - <<: *steps-pg-build
 
-  regress-pg15:
+  build-pg15:
     image: *test-image
     group: build
     environment:
       - PGVER=15
-      - POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
-      - RUNTESTFLAGS=--after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql
     commands:
-      - sh ci/dronie/postgis_regress.sh
+      - <<: *steps-env
+      - <<: *steps-pg-build
+
+  check-pg12:
+    image: *test-image
+    group: check
+    environment:
+      - PGVER=12
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-test-preinstall
+
+  check-pg15:
+    image: *test-image
+    group: check
+    environment:
+      - PGVER=15
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-test-preinstall
+
+  installcheck-pg12:
+    image: *test-image
+    group: installcheck
+    environment:
+      - PGVER=12
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-install
+      - <<: *steps-pg-install
+      - <<: *steps-pg-test-install
+
+  installcheck-pg15:
+    image: *test-image
+    group: installcheck
+    environment:
+      - PGVER=15
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-install
+      - <<: *steps-pg-install
+      - <<: *steps-pg-test-install
+
+  upgradecheck-pg12:
+    image: *test-image
+    group: upgradecheck
+    environment:
+      - PGVER=12
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-install
+      - <<: *steps-pg-test-all-upgrades
+
+  upgradecheck-pg15:
+    image: *test-image
+    group: upgradecheck
+    environment:
+      - PGVER=15
+    commands:
+      - <<: *steps-env
+      - <<: *steps-start-postgresql
+      - <<: *steps-pg-install
+      - <<: *steps-pg-test-all-upgrades

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

Summary of changes:
 .woodpecker/regress.yml | 119 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 111 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list