[SCM] PostGIS branch stable-3.4 updated. 3.4.2-17-g74a65006a
git at osgeo.org
git at osgeo.org
Thu Mar 14 17:03:50 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, stable-3.4 has been updated
via 74a65006a5fca23ee90a70b33cf9d2feb5ab62bf (commit)
from 3b6081068e7e996d5740fe4b2b03ed93cdf877d3 (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 74a65006a5fca23ee90a70b33cf9d2feb5ab62bf
Author: Regina Obe <lr at pcorp.us>
Date: Thu Mar 14 19:59:31 2024 -0400
More fixes for woodie agent
diff --git a/.woodpecker/docs-localized.yml.in b/.woodpecker/docs-localized.yml.in
index 2a823fee6..ece9af87e 100644
--- a/.woodpecker/docs-localized.yml.in
+++ b/.woodpecker/docs-localized.yml.in
@@ -1,12 +1,10 @@
@TARGET at -@LANG@:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/@LANG@ local- at TARGET@
- #group: @GROUP@
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/@LANG@/Makefile.in"
- "doc/po/@LANG@/*.po"
- - "utils/check_localized_cheatsheets.sh"
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index 6c235faa0..a104cfa6a 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -1,32 +1,22 @@
variables:
- &test_image 'docker.osgeo.org/postgis/build-test:trisquel3'
+ - common_doc_paths: &common_doc_paths
+ # related config files
+ - ".woodpecker/docs.yml"
+ # Makefiles
+ - "doc/Makefile.in"
+ - "doc/html/images/Makefile.in"
+ # XML sources
+ - "doc/*.xml"
+ # Internationalization Makefiles
+ - "doc/po/Makefile.local"
- &when_path
include:
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
+ - <<: *common_doc_paths
- &when_path_full
include:
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
- # Localized assets
+ - <<: *common_doc_paths
+ # Any localized assets
- "doc/po/*/Makefile.in"
- "doc/po/*/*.po"
@@ -39,44 +29,53 @@ steps:
- mkdir -p build-docs && cd build-docs
- ../configure --without-pg --without-protobuf --without-raster
- make postgis_revision.h
+ - xmllint --version
when:
path: *when_path_full
check-xml:
image: *test_image
+ pull: true
+ depends_on: prepare
commands:
- make -C build-docs/doc check
when:
path: *when_path
build-images:
image: *test_image
+ pull: true
+ depends_on: prepare
commands:
- make -C build-docs/doc images
when:
- path: *when_path
+ path: *when_path_full
build-html:
image: *test_image
- group: output
+ pull: true
+ depends_on: check-xml
commands:
- make -C build-docs/doc html
when:
path: *when_path
build-cheatsheets:
image: *test_image
- group: output
+ pull: true
+ depends_on: check-xml
commands:
- make -C build-docs/doc/ cheatsheets
when:
- path: *when_path_full
+ path: *when_path
build-chunked-html:
image: *test_image
- group: output
+ pull: true
+ depends_on: check-xml
commands:
- make -C build-docs/doc html
when:
path: *when_path
build-pdf:
image: *test_image
- group: output
+ pull: true
+ depends_on: [ build-images, check-xml ]
commands:
- make -C build-docs/doc/ pdf
when:
@@ -86,350 +85,155 @@ steps:
### TARGET check-xml
check-xml-ja:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/ja local-check-xml
- #group: localized-check-xml
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/ja/Makefile.in"
- "doc/po/ja/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
check-xml-de:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/de local-check-xml
- #group: localized-check-xml
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/de/Makefile.in"
- "doc/po/de/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
check-xml-fr:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/fr local-check-xml
- #group: localized-check-xml
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/fr/Makefile.in"
- "doc/po/fr/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
### TARGET html
html-ja:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/ja local-html
- #group: localized-html
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/ja/Makefile.in"
- "doc/po/ja/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
html-de:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/de local-html
- #group: localized-html
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/de/Makefile.in"
- "doc/po/de/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
html-fr:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/fr local-html
- #group: localized-html
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/fr/Makefile.in"
- "doc/po/fr/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
### TARGET cheatsheets
cheatsheets-ja:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/ja local-cheatsheets
- #group: localized-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/ja/Makefile.in"
- "doc/po/ja/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
cheatsheets-de:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/de local-cheatsheets
- #group: localized-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/de/Makefile.in"
- "doc/po/de/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
cheatsheets-fr:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/fr local-cheatsheets
- #group: localized-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/fr/Makefile.in"
- "doc/po/fr/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
### TARGET check-cheatsheets
check-cheatsheets-ja:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/ja local-check-cheatsheets
- #group: localized-check-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/ja/Makefile.in"
- "doc/po/ja/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
check-cheatsheets-de:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/de local-check-cheatsheets
- #group: localized-check-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/de/Makefile.in"
- "doc/po/de/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
check-cheatsheets-fr:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/fr local-check-cheatsheets
- #group: localized-check-cheatsheets
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/fr/Makefile.in"
- "doc/po/fr/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
### TARGET pdf
pdf-ja:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/ja local-pdf
- #group: localized-pdf
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/ja/Makefile.in"
- "doc/po/ja/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
pdf-de:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/de local-pdf
- #group: localized-pdf
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/de/Makefile.in"
- "doc/po/de/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
pdf-fr:
image: *test_image
+ pull: true
commands:
- make -C build-docs/doc/po/fr local-pdf
- #group: localized-pdf
+ depends_on: @DEP@
when:
path:
include:
- # Localized assets
- - "doc/po/fr/Makefile.in"
- "doc/po/fr/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index a6673821a..ba355cecc 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -39,7 +39,7 @@ variables:
- egrep '(PASS|FAIL|SKIP|INFO|ERROR)' check.log
clone:
- clone:
+ git:
image: woodpeckerci/plugin-git
depth: 50
@@ -53,7 +53,7 @@ steps:
build-pg12:
image: *test-image
- group: build
+ depends_on: autogen
environment:
- PGVER=12
commands:
@@ -62,7 +62,7 @@ steps:
build-pg15:
image: *test-image
- group: build
+ depends_on: autogen
environment:
- PGVER=15
commands:
@@ -71,7 +71,7 @@ steps:
check-pg12:
image: *test-image
- group: check
+ depends_on: build-pg12
environment:
- PGVER=12
commands:
@@ -81,7 +81,7 @@ steps:
check-pg15:
image: *test-image
- group: check
+ depends_on: build-pg15
environment:
- PGVER=15
commands:
@@ -91,7 +91,7 @@ steps:
installcheck-pg12:
image: *test-image
- group: installcheck
+ depends_on: build-pg12
environment:
- PGVER=12
commands:
@@ -102,7 +102,7 @@ steps:
installcheck-pg15:
image: *test-image
- group: installcheck
+ depends_on: build-pg15
environment:
- PGVER=15
commands:
@@ -113,7 +113,7 @@ steps:
upgradecheck-pg12:
image: *test-image
- group: upgradecheck
+ depends_on: build-pg12
environment:
- PGVER=12
commands:
@@ -124,7 +124,7 @@ steps:
upgradecheck-pg15:
image: *test-image
- group: upgradecheck
+ depends_on: build-pg15
environment:
- PGVER=15
commands:
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/docs-localized.yml.in | 6 +-
.woodpecker/docs.yml | 312 +++++++-------------------------------
.woodpecker/regress.yml | 18 +--
3 files changed, 69 insertions(+), 267 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list