[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1184-g65028c31c

git at osgeo.org git at osgeo.org
Sat Jul 8 10:36:43 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  65028c31c4a5604f17814171904251c9d35e9a34 (commit)
       via  ff0ef6c291b2769e8725d9110b4fa313df7167f7 (commit)
      from  55292073765c81e7c529522c13626ca3c636542a (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 65028c31c4a5604f17814171904251c9d35e9a34
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Jul 8 15:41:05 2023 +0200

    Split localized docs from main docs

diff --git a/.woodpecker/docs.yml b/.woodpecker/docs-localized.yml
similarity index 50%
copy from .woodpecker/docs.yml
copy to .woodpecker/docs-localized.yml
index f9af0a8ef..be80cd880 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs-localized.yml
@@ -1,3 +1,15 @@
+matrix:
+  LANG:
+    - it_IT
+    - pt_BR
+    - fr
+    - es
+    - pl
+    - ko_KR
+    - de
+    - ja
+    - ru
+
 pipeline:
   prepare:
     image: docker.osgeo.org/postgis/build-test:trisquel3
@@ -10,30 +22,16 @@ pipeline:
   check-xml:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc check
-      - make -C doc/ check-localized
+      - make -C build-docs/doc/po/${LANG} local-check
   build-html:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc html
-      - make -C doc/ html-localized
-      - make -C doc/ html-clean
-      - make -C doc/ html-clean-localized
+      - make -C build-docs/doc/po/${LANG} local-html
   build-pdf:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc/ pdf
-      - make -C doc/ pdf-localized
-      - make -C doc/ pdf-clean
-      - make -C doc/ pdf-clean-localized
+      - make -C build-docs/doc/po/${LANG} local-pdf
   build-cheatsheets:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc/ cheatsheets
-      - make -C doc/ cheatsheets-localized
-      - make -C doc/ cheatsheet-clean
-      - make -C doc/ cheatsheet-clean-localized
+      - make -C build-docs/doc/po/${LANG} local-cheatsheets
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index f9af0a8ef..c003f7d33 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -10,30 +10,20 @@ pipeline:
   check-xml:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc check
-      - make -C doc/ check-localized
+      - make -C build-docs/doc check
   build-html:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc html
-      - make -C doc/ html-localized
-      - make -C doc/ html-clean
-      - make -C doc/ html-clean-localized
-  build-pdf:
+      - make -C build-docs/doc html
+  build-cheatsheets:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc/ pdf
-      - make -C doc/ pdf-localized
-      - make -C doc/ pdf-clean
-      - make -C doc/ pdf-clean-localized
-  build-cheatsheets:
+      - make -C build-docs/doc/ cheatsheets
+  build-chunked-html:
+    image: docker.osgeo.org/postgis/build-test:trisquel3
+    commands:
+      - make -C build-docs/doc html
+  build-pdf:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
-      - cd build-docs
-      - make -C doc/ cheatsheets
-      - make -C doc/ cheatsheets-localized
-      - make -C doc/ cheatsheet-clean
-      - make -C doc/ cheatsheet-clean-localized
+      - make -C build-docs/doc/ pdf

commit ff0ef6c291b2769e8725d9110b4fa313df7167f7
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Jul 8 19:35:11 2023 +0200

    Encode dependency of translated .xml on the english .xml

diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 3ae8810c4..d7968f635 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -27,6 +27,6 @@ include ../../Makefile
 # XML gettext tools
 PO2XML=po2xml
 
-$(XML_SOURCES): %.xml: %.xml.po
+$(XML_SOURCES): %.xml: %.xml.po $(srcdir)/../../%.xml
 	$(PO2XML) $(srcdir)/../../$@ $< > $@
 

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

Summary of changes:
 .woodpecker/{docs.yml => docs-localized.yml} | 34 +++++++++++++---------------
 .woodpecker/docs.yml                         | 30 ++++++++----------------
 doc/po/Makefile.local                        |  2 +-
 3 files changed, 27 insertions(+), 39 deletions(-)
 copy .woodpecker/{docs.yml => docs-localized.yml} (50%)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list