[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-308-g46762f988
git at osgeo.org
git at osgeo.org
Wed Sep 6 04:01:09 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 46762f988e7e45f5fc04a6df527bf687a85ec8b1 (commit)
from d2e470e0be11d3a58296680dbf9a301dcfaca383 (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 46762f988e7e45f5fc04a6df527bf687a85ec8b1
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Sep 6 12:26:10 2023 +0200
[woodie] Reduce code duplication for docs workflow
diff --git a/.woodpecker/docs-localized.yml.in b/.woodpecker/docs-localized.yml.in
index 2f3665785..48cbc8ba5 100644
--- a/.woodpecker/docs-localized.yml.in
+++ b/.woodpecker/docs-localized.yml.in
@@ -6,6 +6,7 @@
when:
path:
include:
+ - <<: *common_doc_paths
# Localized assets
- "doc/po/@LANG@/Makefile.in"
- "doc/po/@LANG@/*.po"
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index ca48078a2..8b8dfd0ac 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"
@@ -94,21 +84,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -117,21 +97,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -140,21 +110,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
@@ -164,21 +124,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -187,21 +137,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -210,21 +150,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
@@ -234,21 +164,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -257,21 +177,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -280,21 +190,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
@@ -304,21 +204,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -327,21 +217,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -350,21 +230,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
@@ -374,21 +244,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -397,21 +257,11 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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
commands:
@@ -420,18 +270,8 @@ steps:
when:
path:
include:
+ - <<: *common_doc_paths
# 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/update-docs-localized.sh b/.woodpecker/update-docs-localized.sh
index 991b4ec31..131fbe067 100755
--- a/.woodpecker/update-docs-localized.sh
+++ b/.woodpecker/update-docs-localized.sh
@@ -9,10 +9,6 @@ TARGETS="check-xml html cheatsheets check-cheatsheets pdf"
cat docs.yml | sed '/DO NOT EDIT/q' > docs.yml.new
-cat docs.yml.new |
- sed '/# Common docs path/,/# END OF COMMON/!d;/# END OF COMMON/q' |
- sed 's/^/ /' > docs.yml.common_paths
-
exec >> docs.yml.new
for target in ${TARGETS}
do
@@ -21,10 +17,7 @@ do
do
group=localized-${target}
sed "s/@LANG@/${lang}/;s/@TARGET@/${target}/;s/@GROUP@/${group}/" docs-localized.yml.in
- # Add common docs paths
- cat docs.yml.common_paths
done
done
mv -b docs.yml.new docs.yml
-rm docs.yml.common_paths
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/docs-localized.yml.in | 1 +
.woodpecker/docs.yml | 216 +++++------------------------------
.woodpecker/update-docs-localized.sh | 7 --
3 files changed, 29 insertions(+), 195 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list