[SCM] PostGIS branch master updated. 3.4.0rc1-1044-ga7ad55a4e
git at osgeo.org
git at osgeo.org
Fri Mar 22 18:46:32 PDT 2024
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 a7ad55a4e92fda4cbbd71b95a710a48fb24907ee (commit)
via 3085fb74de93e63951afcaffb7975ed2cb849ca6 (commit)
from a5b7632c451016065415f1999616c220125e35cd (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 a7ad55a4e92fda4cbbd71b95a710a48fb24907ee
Author: Regina Obe <lr at pcorp.us>
Date: Fri Mar 22 21:46:17 2024 -0400
Try to fix woodpecker bad_habit warning
diff --git a/.woodpecker/docs-localized.yml.in b/.woodpecker/docs-localized.yml.in
index ece9af87e..382a8194f 100644
--- a/.woodpecker/docs-localized.yml.in
+++ b/.woodpecker/docs-localized.yml.in
@@ -5,6 +5,7 @@
- make -C build-docs/doc/po/@LANG@ local- at TARGET@
depends_on: @DEP@
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/@LANG@/*.po"
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index 2c7c4870a..9a9b48012 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -90,7 +90,8 @@ steps:
- make -C build-docs/doc/po/it_IT local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/it_IT/*.po"
check-xml-pt_BR:
@@ -100,7 +101,8 @@ steps:
- make -C build-docs/doc/po/pt_BR local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pt_BR/*.po"
check-xml-fr:
@@ -110,7 +112,8 @@ steps:
- make -C build-docs/doc/po/fr local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/fr/*.po"
check-xml-es:
@@ -120,7 +123,8 @@ steps:
- make -C build-docs/doc/po/es local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/es/*.po"
check-xml-pl:
@@ -130,7 +134,8 @@ steps:
- make -C build-docs/doc/po/pl local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pl/*.po"
check-xml-ko_KR:
@@ -140,7 +145,8 @@ steps:
- make -C build-docs/doc/po/ko_KR local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ko_KR/*.po"
check-xml-de:
@@ -150,7 +156,8 @@ steps:
- make -C build-docs/doc/po/de local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/de/*.po"
check-xml-ja:
@@ -160,7 +167,8 @@ steps:
- make -C build-docs/doc/po/ja local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ja/*.po"
check-xml-ru:
@@ -170,7 +178,8 @@ steps:
- make -C build-docs/doc/po/ru local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ru/*.po"
check-xml-zh_Hans:
@@ -180,7 +189,8 @@ steps:
- make -C build-docs/doc/po/zh_Hans local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/zh_Hans/*.po"
check-xml-ro:
@@ -190,7 +200,8 @@ steps:
- make -C build-docs/doc/po/ro local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ro/*.po"
check-xml-uk:
@@ -200,7 +211,8 @@ steps:
- make -C build-docs/doc/po/uk local-check-xml
depends_on: prepare
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/uk/*.po"
### TARGET html
@@ -211,7 +223,8 @@ steps:
- make -C build-docs/doc/po/it_IT local-html
depends_on: check-xml-it_IT
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/it_IT/*.po"
html-pt_BR:
@@ -221,7 +234,8 @@ steps:
- make -C build-docs/doc/po/pt_BR local-html
depends_on: check-xml-pt_BR
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pt_BR/*.po"
html-fr:
@@ -231,7 +245,8 @@ steps:
- make -C build-docs/doc/po/fr local-html
depends_on: check-xml-fr
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/fr/*.po"
html-es:
@@ -241,7 +256,8 @@ steps:
- make -C build-docs/doc/po/es local-html
depends_on: check-xml-es
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/es/*.po"
html-pl:
@@ -251,7 +267,8 @@ steps:
- make -C build-docs/doc/po/pl local-html
depends_on: check-xml-pl
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pl/*.po"
html-ko_KR:
@@ -261,7 +278,8 @@ steps:
- make -C build-docs/doc/po/ko_KR local-html
depends_on: check-xml-ko_KR
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ko_KR/*.po"
html-de:
@@ -271,7 +289,8 @@ steps:
- make -C build-docs/doc/po/de local-html
depends_on: check-xml-de
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/de/*.po"
html-ja:
@@ -281,7 +300,8 @@ steps:
- make -C build-docs/doc/po/ja local-html
depends_on: check-xml-ja
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ja/*.po"
html-ru:
@@ -291,7 +311,8 @@ steps:
- make -C build-docs/doc/po/ru local-html
depends_on: check-xml-ru
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ru/*.po"
html-zh_Hans:
@@ -301,7 +322,8 @@ steps:
- make -C build-docs/doc/po/zh_Hans local-html
depends_on: check-xml-zh_Hans
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/zh_Hans/*.po"
html-ro:
@@ -311,7 +333,8 @@ steps:
- make -C build-docs/doc/po/ro local-html
depends_on: check-xml-ro
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ro/*.po"
html-uk:
@@ -321,7 +344,8 @@ steps:
- make -C build-docs/doc/po/uk local-html
depends_on: check-xml-uk
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/uk/*.po"
### TARGET cheatsheets
@@ -332,7 +356,8 @@ steps:
- make -C build-docs/doc/po/it_IT local-cheatsheets
depends_on: check-xml-it_IT
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/it_IT/*.po"
cheatsheets-pt_BR:
@@ -342,7 +367,8 @@ steps:
- make -C build-docs/doc/po/pt_BR local-cheatsheets
depends_on: check-xml-pt_BR
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pt_BR/*.po"
cheatsheets-fr:
@@ -352,7 +378,8 @@ steps:
- make -C build-docs/doc/po/fr local-cheatsheets
depends_on: check-xml-fr
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/fr/*.po"
cheatsheets-es:
@@ -362,7 +389,8 @@ steps:
- make -C build-docs/doc/po/es local-cheatsheets
depends_on: check-xml-es
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/es/*.po"
cheatsheets-pl:
@@ -372,7 +400,8 @@ steps:
- make -C build-docs/doc/po/pl local-cheatsheets
depends_on: check-xml-pl
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pl/*.po"
cheatsheets-ko_KR:
@@ -382,7 +411,8 @@ steps:
- make -C build-docs/doc/po/ko_KR local-cheatsheets
depends_on: check-xml-ko_KR
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ko_KR/*.po"
cheatsheets-de:
@@ -392,7 +422,8 @@ steps:
- make -C build-docs/doc/po/de local-cheatsheets
depends_on: check-xml-de
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/de/*.po"
cheatsheets-ja:
@@ -402,7 +433,8 @@ steps:
- make -C build-docs/doc/po/ja local-cheatsheets
depends_on: check-xml-ja
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ja/*.po"
cheatsheets-ru:
@@ -412,7 +444,8 @@ steps:
- make -C build-docs/doc/po/ru local-cheatsheets
depends_on: check-xml-ru
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ru/*.po"
cheatsheets-zh_Hans:
@@ -422,7 +455,8 @@ steps:
- make -C build-docs/doc/po/zh_Hans local-cheatsheets
depends_on: check-xml-zh_Hans
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/zh_Hans/*.po"
cheatsheets-ro:
@@ -432,7 +466,8 @@ steps:
- make -C build-docs/doc/po/ro local-cheatsheets
depends_on: check-xml-ro
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ro/*.po"
cheatsheets-uk:
@@ -442,7 +477,8 @@ steps:
- make -C build-docs/doc/po/uk local-cheatsheets
depends_on: check-xml-uk
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/uk/*.po"
### TARGET check-cheatsheets
@@ -453,7 +489,8 @@ steps:
- make -C build-docs/doc/po/it_IT local-check-cheatsheets
depends_on: [ cheatsheets-it_IT, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/it_IT/*.po"
check-cheatsheets-pt_BR:
@@ -463,7 +500,8 @@ steps:
- make -C build-docs/doc/po/pt_BR local-check-cheatsheets
depends_on: [ cheatsheets-pt_BR, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pt_BR/*.po"
check-cheatsheets-fr:
@@ -473,7 +511,8 @@ steps:
- make -C build-docs/doc/po/fr local-check-cheatsheets
depends_on: [ cheatsheets-fr, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/fr/*.po"
check-cheatsheets-es:
@@ -483,7 +522,8 @@ steps:
- make -C build-docs/doc/po/es local-check-cheatsheets
depends_on: [ cheatsheets-es, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/es/*.po"
check-cheatsheets-pl:
@@ -493,7 +533,8 @@ steps:
- make -C build-docs/doc/po/pl local-check-cheatsheets
depends_on: [ cheatsheets-pl, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pl/*.po"
check-cheatsheets-ko_KR:
@@ -503,7 +544,8 @@ steps:
- make -C build-docs/doc/po/ko_KR local-check-cheatsheets
depends_on: [ cheatsheets-ko_KR, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ko_KR/*.po"
check-cheatsheets-de:
@@ -513,7 +555,8 @@ steps:
- make -C build-docs/doc/po/de local-check-cheatsheets
depends_on: [ cheatsheets-de, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/de/*.po"
check-cheatsheets-ja:
@@ -523,7 +566,8 @@ steps:
- make -C build-docs/doc/po/ja local-check-cheatsheets
depends_on: [ cheatsheets-ja, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ja/*.po"
check-cheatsheets-ru:
@@ -533,7 +577,8 @@ steps:
- make -C build-docs/doc/po/ru local-check-cheatsheets
depends_on: [ cheatsheets-ru, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ru/*.po"
check-cheatsheets-zh_Hans:
@@ -543,7 +588,8 @@ steps:
- make -C build-docs/doc/po/zh_Hans local-check-cheatsheets
depends_on: [ cheatsheets-zh_Hans, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/zh_Hans/*.po"
check-cheatsheets-ro:
@@ -553,7 +599,8 @@ steps:
- make -C build-docs/doc/po/ro local-check-cheatsheets
depends_on: [ cheatsheets-ro, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ro/*.po"
check-cheatsheets-uk:
@@ -563,7 +610,8 @@ steps:
- make -C build-docs/doc/po/uk local-check-cheatsheets
depends_on: [ cheatsheets-uk, build-cheatsheets ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/uk/*.po"
### TARGET pdf
@@ -574,7 +622,8 @@ steps:
- make -C build-docs/doc/po/it_IT local-pdf
depends_on: [ build-images, check-xml-it_IT ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/it_IT/*.po"
pdf-pt_BR:
@@ -584,7 +633,8 @@ steps:
- make -C build-docs/doc/po/pt_BR local-pdf
depends_on: [ build-images, check-xml-pt_BR ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pt_BR/*.po"
pdf-fr:
@@ -594,7 +644,8 @@ steps:
- make -C build-docs/doc/po/fr local-pdf
depends_on: [ build-images, check-xml-fr ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/fr/*.po"
pdf-es:
@@ -604,7 +655,8 @@ steps:
- make -C build-docs/doc/po/es local-pdf
depends_on: [ build-images, check-xml-es ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/es/*.po"
pdf-pl:
@@ -614,7 +666,8 @@ steps:
- make -C build-docs/doc/po/pl local-pdf
depends_on: [ build-images, check-xml-pl ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/pl/*.po"
pdf-ko_KR:
@@ -624,7 +677,8 @@ steps:
- make -C build-docs/doc/po/ko_KR local-pdf
depends_on: [ build-images, check-xml-ko_KR ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ko_KR/*.po"
pdf-de:
@@ -634,7 +688,8 @@ steps:
- make -C build-docs/doc/po/de local-pdf
depends_on: [ build-images, check-xml-de ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/de/*.po"
pdf-ja:
@@ -644,7 +699,8 @@ steps:
- make -C build-docs/doc/po/ja local-pdf
depends_on: [ build-images, check-xml-ja ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ja/*.po"
pdf-ru:
@@ -654,7 +710,8 @@ steps:
- make -C build-docs/doc/po/ru local-pdf
depends_on: [ build-images, check-xml-ru ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ru/*.po"
pdf-zh_Hans:
@@ -664,7 +721,8 @@ steps:
- make -C build-docs/doc/po/zh_Hans local-pdf
depends_on: [ build-images, check-xml-zh_Hans ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/zh_Hans/*.po"
pdf-ro:
@@ -674,7 +732,8 @@ steps:
- make -C build-docs/doc/po/ro local-pdf
depends_on: [ build-images, check-xml-ro ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/ro/*.po"
pdf-uk:
@@ -684,6 +743,7 @@ steps:
- make -C build-docs/doc/po/uk local-pdf
depends_on: [ build-images, check-xml-uk ]
when:
- path:
+ - event: [push, pull_request]
+ path:
include:
- "doc/po/uk/*.po"
commit 3085fb74de93e63951afcaffb7975ed2cb849ca6
Author: Regina Obe <lr at pcorp.us>
Date: Fri Mar 22 21:37:59 2024 -0400
Increase alloted time some more for interrupt buffer and relate
diff --git a/regress/core/interrupt_buffer.sql b/regress/core/interrupt_buffer.sql
index eb7a00893..949fc7e28 100644
--- a/regress/core/interrupt_buffer.sql
+++ b/regress/core/interrupt_buffer.sql
@@ -21,7 +21,7 @@ SET statement_timeout TO 100;
select ST_Buffer(g,100) from _inputs WHERE id = 1;
--( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo;
-- it may take some more to interrupt st_buffer, see
-SELECT _timecheck('buffer', '300ms');
+SELECT _timecheck('buffer', '350ms');
-- Not affected by old timeout
SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1));
diff --git a/regress/core/interrupt_relate.sql b/regress/core/interrupt_relate.sql
index 547caa2bc..d80dacf1c 100644
--- a/regress/core/interrupt_relate.sql
+++ b/regress/core/interrupt_relate.sql
@@ -19,32 +19,32 @@ SELECT 1::int as id, ST_Collect(g) g FROM (
SET statement_timeout TO 100;
select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('contains', '200ms');
+SELECT _timecheck('contains', '220ms');
select ST_Covers(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('covers', '200ms');
+SELECT _timecheck('covers', '220ms');
select ST_CoveredBy(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('coveredby', '200ms');
+SELECT _timecheck('coveredby', '250ms');
select ST_Crosses(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('crosses', '200ms');
+SELECT _timecheck('crosses', '220ms');
-- NOTE: we're reversing one of the operands to avoid the
-- short-circuit described in #3226
select ST_Equals(g,st_reverse(g)) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('equals', '200ms');
+SELECT _timecheck('equals', '220ms');
-- NOTE: intersects became very fast, so we segmentize
-- input to make it slower
select ST_Intersects(g,ST_Segmentize(g,1e-4)) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('intersects', '200ms');
+SELECT _timecheck('intersects', '210ms');
select ST_Overlaps(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('overlaps', '200ms');
+SELECT _timecheck('overlaps', '220ms');
select ST_Relate(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('relate', '200ms');
+SELECT _timecheck('relate', '220ms');
DROP FUNCTION _timecheck(text, interval);
DROP TABLE _inputs;
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/docs-localized.yml.in | 3 +-
.woodpecker/docs.yml | 180 +++++++++++++++++++++++++-------------
regress/core/interrupt_buffer.sql | 2 +-
regress/core/interrupt_relate.sql | 16 ++--
4 files changed, 131 insertions(+), 70 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list