[postgis-tickets] [SCM] PostGIS branch stable-3.4 updated. 3.4.0rc2-7-g99647ab4d

git at osgeo.org git at osgeo.org
Sun Aug 13 21:28:23 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, stable-3.4 has been updated
       via  99647ab4d2f30813d6999dc4106b7dd98ac702c5 (commit)
       via  016039274243c22bc32ceb38aae6cc8c6ac35302 (commit)
      from  03dbb4758bcb4df63c872f5d99f6f408726ce3f9 (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 99647ab4d2f30813d6999dc4106b7dd98ac702c5
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Aug 14 00:28:11 2023 -0400

    Update ci statuses to follow 3.4 ci branches

diff --git a/README.md b/README.md
index 74f550099..7126c51bb 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,14 @@
 
 | **Debbie** | **Winnie** | **Dronie** |
 | ---------  | ---------- | ---------  |
-| [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [![Build Status](https://winnie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://winnie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=master)](https://dronie.osgeo.org/postgis/postgis?branch=master) ||
+| [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_3.3)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_3.3/) | [![Build Status](https://winnie.postgis.net/buildStatus/icon?job=PostGIS_3.3)](https://winnie.postgis.net/view/PostGIS/job/PostGIS_3.3/) | [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=stable-3.4)](https://dronie.osgeo.org/postgis/postgis?branch=stable-3.4) ||
 | **Bessie** | **Bessie32** | **Cirrus-CI** |
-|  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) |  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie32)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) |  [![Build Status](https://api.cirrus-ci.com/github/postgis/postgis.svg?branch=master)](http://cirrus-ci.com/github/postgis/postgis) |
+|  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel=bessie&build=last:${params.reference=refs/heads/stable-3.4})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) |  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie32&build=last:${params.reference=refs/heads/stable-3.4})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) |  [![Build Status](https://api.cirrus-ci.com/github/postgis/postgis.svg?branch=stable-3.4)](http://cirrus-ci.com/github/postgis/postgis) |
 | **Berrie** | **Berrie64** |
-|  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie&build=last:${params.reference=refs/heads/master})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/) |  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie64&build=last:${params.reference=refs/heads/master})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64/) | ||
-| **GitHub** | **Woodie** | **GitLab**
-| [![CI](https://github.com/postgis/postgis/workflows/CI/badge.svg?branch=master)](https://github.com/postgis/postgis/actions?query=branch%3Amaster) | [![Woodie](https://woodie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=master)](https://woodie.osgeo.org/postgis/postgis/branches/master) | [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/master/pipeline.svg)](https://gitlab.com/postgis/postgis/commits/master) | ||
+|  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie&build=last:${params.reference=refs/heads/stable-3.4})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/) |  [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run/label=berrie64&build=last:${params.reference=refs/heads/stable-3.4})](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64/) | ||
+| **GitHub** | **GitLab** |
+| [![CI](https://github.com/postgis/postgis/workflows/CI/badge.svg?branch=stable-3.4)](https://github.com/postgis/postgis/actions?query=branch%3Astable-3.4) | [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/stable-3.4/pipeline.svg)](https://gitlab.com/postgis/postgis/commits/stable-3.4) ||
+
 
 This file is here to play nicely with modern code repository facilities.
 Actual readme is [here](README.postgis).

commit 016039274243c22bc32ceb38aae6cc8c6ac35302
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Aug 13 23:34:38 2023 -0400

    Wrong syntax for ifdef in prior commit
    
    References #5476
    References #5469
    Closes https://git.osgeo.org/gitea/postgis/postgis/pulls/137

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 44fcece78..dc13a272a 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -205,7 +205,7 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@
-ifdef @MKDIR_P@
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 518292e7f..09ccc8c08 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -149,7 +149,8 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@
-ifdef @MKDIR_P@
+
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index e3404014b..ceb0eade2 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -131,7 +131,7 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@
-ifdef @MKDIR_P@
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index d127ddda8..28f00a99c 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -103,7 +103,7 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@
-ifdef @MKDIR_P@
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 5e4baa633..49c8a975a 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -214,7 +214,7 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@
-ifdef @MKDIR_P@
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 553182d2d..f5c9c9920 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -108,7 +108,7 @@ PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@
-ifdef @MKDIR_P@
+ifneq (@MKDIR_P@,)
 	MKDIR_P = @MKDIR_P@
 endif
 

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

Summary of changes:
 README.md                                     | 11 ++++++-----
 extensions/address_standardizer/Makefile.in   |  2 +-
 extensions/postgis/Makefile.in                |  3 ++-
 extensions/postgis_raster/Makefile.in         |  2 +-
 extensions/postgis_sfcgal/Makefile.in         |  2 +-
 extensions/postgis_tiger_geocoder/Makefile.in |  2 +-
 extensions/postgis_topology/Makefile.in       |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list