[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1187-gc80e97e59

git at osgeo.org git at osgeo.org
Sat Jul 8 14:21:58 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  c80e97e59a3f92ef4044f0427bc263e59059ca05 (commit)
      from  92dd3257a02d227c392113298360e4244c273463 (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 c80e97e59a3f92ef4044f0427bc263e59059ca05
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Jul 8 21:17:48 2023 +0200

    [woodie] Reorganize docs workflow to avoid per-lang clone and configure
    
    Replaces matrix with generated static list of steps

diff --git a/.woodpecker/docs-localized.yml b/.woodpecker/docs-localized.yml
deleted file mode 100644
index 05829b372..000000000
--- a/.woodpecker/docs-localized.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-matrix:
-  TR:
-    - it_IT
-    - pt_BR
-    - fr
-    - es
-    - pl
-    - ko_KR
-    - de
-    - ja
-    - ru
-
-pipeline:
-  prepare:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
-    pull: true
-    commands:
-      - ./autogen.sh
-      - mkdir -p build-docs && cd build-docs
-      - ../configure --without-pg
-      - make postgis_revision.h
-    when:
-      path: "doc/po/${TR}/*.po"
-  check-xml:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
-    commands:
-      - make -C build-docs/doc/po/${TR} local-check
-    when:
-      path: "doc/po/${TR}/*.po"
-  build-html:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
-    commands:
-      - make -C build-docs/doc/po/${TR} local-html
-    when:
-      path: "doc/po/${TR}/*.po"
-  build-pdf:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
-    commands:
-      - make -C build-docs/doc/po/${TR} local-pdf
-    when:
-      path: "doc/po/${TR}/*.po"
-  build-cheatsheets:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
-    commands:
-      - make -C build-docs/doc/po/${TR} local-cheatsheets
-    when:
-      path: "doc/po/${TR}/*.po"
diff --git a/.woodpecker/docs-localized.yml.in b/.woodpecker/docs-localized.yml.in
new file mode 100644
index 000000000..24221e8f9
--- /dev/null
+++ b/.woodpecker/docs-localized.yml.in
@@ -0,0 +1,27 @@
+  check-xml- at LANG@:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/@LANG@ local-check
+    when:
+      path: *when_path
+  build-html- at LANG@:
+    image: *test_image
+    group: output- at LANG@
+    commands:
+      - make -C build-docs/doc/po/@LANG@ local-html
+    when:
+      path: *when_path
+  build-pdf- at LANG@:
+    image: *test_image
+    group: output- at LANG@
+    commands:
+      - make -C build-docs/doc/po/@LANG@ local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets- at LANG@:
+    image: *test_image
+    group: output- at LANG@
+    commands:
+      - make -C build-docs/doc/po/@LANG@ local-cheatsheets
+    when:
+      path: *when_path
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index c003f7d33..c8e6f19a3 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -1,29 +1,309 @@
+variables:
+  - &test_image 'docker.osgeo.org/postgis/build-test:trisquel3'
+  - &when_path
+      include:
+        # related config files
+        - ".woodpecker/docs.yml"
+        # Makefiles
+        - "doc/Makefile.in"
+        # XML sources
+        - "doc/*.xml"
+        # Localized Makefiles
+        - "doc/po/Makefile.local"
+        - "doc/po/*/Makefile.local"
+        # Translation files
+        - "doc/po/*/*.po"
+
 pipeline:
   prepare:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
     pull: true
     commands:
       - ./autogen.sh
       - mkdir -p build-docs && cd build-docs
       - ../configure --without-pg
       - make postgis_revision.h
+    when:
+      path: *when_path
   check-xml:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
     commands:
       - make -C build-docs/doc check
+    when:
+      path: *when_path
   build-html:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
+    group: output
     commands:
       - make -C build-docs/doc html
+    when:
+      path: *when_path
   build-cheatsheets:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
+    group: output
     commands:
       - make -C build-docs/doc/ cheatsheets
+    when:
+      path: *when_path
   build-chunked-html:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
+    group: output
     commands:
       - make -C build-docs/doc html
+    when:
+      path: *when_path
   build-pdf:
-    image: docker.osgeo.org/postgis/build-test:trisquel3
+    image: *test_image
+    group: output
     commands:
       - make -C build-docs/doc/ pdf
+    when:
+      path: *when_path
+
+  # DO NOT EDIT PAST THIS LINE, use update-docs-localized.sh to update #
+
+# Supported languages  it_IT pt_BR fr es pl ko_KR de ja ru
+
+  check-xml-it_IT:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/it_IT local-check
+    when:
+      path: *when_path
+  build-html-it_IT:
+    image: *test_image
+    group: output-it_IT
+    commands:
+      - make -C build-docs/doc/po/it_IT local-html
+    when:
+      path: *when_path
+  build-pdf-it_IT:
+    image: *test_image
+    group: output-it_IT
+    commands:
+      - make -C build-docs/doc/po/it_IT local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-it_IT:
+    image: *test_image
+    group: output-it_IT
+    commands:
+      - make -C build-docs/doc/po/it_IT local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-pt_BR:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/pt_BR local-check
+    when:
+      path: *when_path
+  build-html-pt_BR:
+    image: *test_image
+    group: output-pt_BR
+    commands:
+      - make -C build-docs/doc/po/pt_BR local-html
+    when:
+      path: *when_path
+  build-pdf-pt_BR:
+    image: *test_image
+    group: output-pt_BR
+    commands:
+      - make -C build-docs/doc/po/pt_BR local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-pt_BR:
+    image: *test_image
+    group: output-pt_BR
+    commands:
+      - make -C build-docs/doc/po/pt_BR local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-fr:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/fr local-check
+    when:
+      path: *when_path
+  build-html-fr:
+    image: *test_image
+    group: output-fr
+    commands:
+      - make -C build-docs/doc/po/fr local-html
+    when:
+      path: *when_path
+  build-pdf-fr:
+    image: *test_image
+    group: output-fr
+    commands:
+      - make -C build-docs/doc/po/fr local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-fr:
+    image: *test_image
+    group: output-fr
+    commands:
+      - make -C build-docs/doc/po/fr local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-es:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/es local-check
+    when:
+      path: *when_path
+  build-html-es:
+    image: *test_image
+    group: output-es
+    commands:
+      - make -C build-docs/doc/po/es local-html
+    when:
+      path: *when_path
+  build-pdf-es:
+    image: *test_image
+    group: output-es
+    commands:
+      - make -C build-docs/doc/po/es local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-es:
+    image: *test_image
+    group: output-es
+    commands:
+      - make -C build-docs/doc/po/es local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-pl:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/pl local-check
+    when:
+      path: *when_path
+  build-html-pl:
+    image: *test_image
+    group: output-pl
+    commands:
+      - make -C build-docs/doc/po/pl local-html
+    when:
+      path: *when_path
+  build-pdf-pl:
+    image: *test_image
+    group: output-pl
+    commands:
+      - make -C build-docs/doc/po/pl local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-pl:
+    image: *test_image
+    group: output-pl
+    commands:
+      - make -C build-docs/doc/po/pl local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-ko_KR:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/ko_KR local-check
+    when:
+      path: *when_path
+  build-html-ko_KR:
+    image: *test_image
+    group: output-ko_KR
+    commands:
+      - make -C build-docs/doc/po/ko_KR local-html
+    when:
+      path: *when_path
+  build-pdf-ko_KR:
+    image: *test_image
+    group: output-ko_KR
+    commands:
+      - make -C build-docs/doc/po/ko_KR local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-ko_KR:
+    image: *test_image
+    group: output-ko_KR
+    commands:
+      - make -C build-docs/doc/po/ko_KR local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-de:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/de local-check
+    when:
+      path: *when_path
+  build-html-de:
+    image: *test_image
+    group: output-de
+    commands:
+      - make -C build-docs/doc/po/de local-html
+    when:
+      path: *when_path
+  build-pdf-de:
+    image: *test_image
+    group: output-de
+    commands:
+      - make -C build-docs/doc/po/de local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-de:
+    image: *test_image
+    group: output-de
+    commands:
+      - make -C build-docs/doc/po/de local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-ja:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/ja local-check
+    when:
+      path: *when_path
+  build-html-ja:
+    image: *test_image
+    group: output-ja
+    commands:
+      - make -C build-docs/doc/po/ja local-html
+    when:
+      path: *when_path
+  build-pdf-ja:
+    image: *test_image
+    group: output-ja
+    commands:
+      - make -C build-docs/doc/po/ja local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-ja:
+    image: *test_image
+    group: output-ja
+    commands:
+      - make -C build-docs/doc/po/ja local-cheatsheets
+    when:
+      path: *when_path
+  check-xml-ru:
+    image: *test_image
+    commands:
+      - make -C build-docs/doc/po/ru local-check
+    when:
+      path: *when_path
+  build-html-ru:
+    image: *test_image
+    group: output-ru
+    commands:
+      - make -C build-docs/doc/po/ru local-html
+    when:
+      path: *when_path
+  build-pdf-ru:
+    image: *test_image
+    group: output-ru
+    commands:
+      - make -C build-docs/doc/po/ru local-pdf
+    when:
+      path: *when_path
+  build-cheatsheets-ru:
+    image: *test_image
+    group: output-ru
+    commands:
+      - make -C build-docs/doc/po/ru local-cheatsheets
+    when:
+      path: *when_path
diff --git a/.woodpecker/update-docs-localized.sh b/.woodpecker/update-docs-localized.sh
new file mode 100755
index 000000000..bb9f4fc67
--- /dev/null
+++ b/.woodpecker/update-docs-localized.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cd $(dirname $0)
+
+SUPPORTED_LANGUAGES=$(grep ^translations ../doc/Makefile.in | cut -d= -f2)
+
+exec > docs.yml.new
+
+cat docs.yml | sed '/DO NOT EDIT/q'
+echo
+echo "# Supported languages $SUPPORTED_LANGUAGES"
+echo
+
+
+for lang in ${SUPPORTED_LANGUAGES};
+do
+  sed "s/@LANG@/$lang/" docs-localized.yml.in
+done
+
+mv -b docs.yml.new docs.yml

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

Summary of changes:
 .woodpecker/docs-localized.yml       |  47 ------
 .woodpecker/docs-localized.yml.in    |  27 ++++
 .woodpecker/docs.yml                 | 292 ++++++++++++++++++++++++++++++++++-
 .woodpecker/update-docs-localized.sh |  20 +++
 4 files changed, 333 insertions(+), 53 deletions(-)
 delete mode 100644 .woodpecker/docs-localized.yml
 create mode 100644 .woodpecker/docs-localized.yml.in
 create mode 100755 .woodpecker/update-docs-localized.sh


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list