[postgis-tickets] [SCM] postgis.net branch hugo updated. 99850e9b1f3aea66fdd43b8f9c4253f038d60702

git at osgeo.org git at osgeo.org
Sun Feb 27 10:23:11 PST 2022


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.net".

The branch, hugo has been updated
       via  99850e9b1f3aea66fdd43b8f9c4253f038d60702 (commit)
      from  f476b54d80b7c79fcd28c7143edafcc8e2234cd3 (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 99850e9b1f3aea66fdd43b8f9c4253f038d60702
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Feb 27 13:23:05 2022 -0500

    Fix sorting of docs and source tar balls and clean up source page

diff --git a/config/_default/params.toml b/config/_default/params.toml
index 483e6bd..bf8cbb8 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -124,14 +124,36 @@ release_docs =  "https://download.osgeo.org/postgis/docs"
 release_source = "https://download.osgeo.org/postgis/source"
 release_notes = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag"
 dev_download = "/stuff"
-releases = ['3.2.1', '3.1.5', '3.0.5', '2.5.5', '2.4.9']
 
+[postgis.releases]
+  [postgis.releases.dev]
+    minor = "dev"
+    dev = "3.3.0dev"
+    tag = "3.3.0dev"
+  [postgis.releases.32]
+    minor = "3.2"
+    dev = "3.2.2dev"
+    tag = "3.2.1"
+  [postgis.releases.31]
+    minor = "3.1"
+    dev = "3.1.6dev"
+    tag = "3.1.5"
+  [postgis.releases.30]
+    minor = "3.0"
+    dev = "3.0.6dev"
+    tag = "3.0.5"
+  [postgis.releases.25]
+    minor = "2.5"
+    dev = "2.5.6dev"
+    tag = "2.5.5"
+  [postgis.releases.24]
+    minor = "2.4"
+    dev = "2.4.10dev"
+    tag = "2.4.9"
+  [postgis.releases.23]
+    minor = "2.3"
+    dev = "2.3.11"
+    tag = "2.3.11"
+    eol = true
 
-[postgis.dev_releases]
-"dev" = "3.3.0dev"
-"3.2" = "3.2.2dev"
-"3.1" = "3.1.6dev"
-"3.0" = "3.0.6dev"
-"2.5" = "2.5.6dev"
-"2.4" = "2.4.10dev"
 
diff --git a/content/pages/source.md b/content/pages/source.md
index c8eb013..26815fa 100644
--- a/content/pages/source.md
+++ b/content/pages/source.md
@@ -8,26 +8,22 @@ sidebar: false
 {{< columns >}}
 The latest source code and companion user doc releases are:
 
-{{< sourcelinks stable>}}
+{{< sourcelinks release>}}
 
 
 **Can't find your version listed here? it's probably been EOL'd**
 
-Refer to our [Version compatibility and EOL Policy]({{ pcurl('eol_policy') }}) for details.
+Refer to our [Version compatibility and EOL Policy](/eol_policy) for details.
 
 Versions that have reached end of life can still be downloaded from [PostGIS source tar balls]({{postgis.release_source}}).
 
 ## Latest development snapshot:
 
-* [postgis-{{ postgis.trunk_version }}.tar.gz]({{postgis.dev_download}}/postgis-{{ postgis.trunk_version }}.tar.gz)
+{{< sourcelinks dev>}}
 
 ## Latest stable branch snapshots:
 
-* [postgis-3.2.1dev.tar.gz]({{postgis.dev_download}}/postgis-3.2.1dev.tar.gz)
-* [postgis-3.1.5dev.tar.gz]({{postgis.dev_download}}/postgis-3.1.5dev.tar.gz)
-* [postgis-3.0.4dev.tar.gz]({{postgis.dev_download}}/postgis-3.0.4dev.tar.gz)
-* [postgis-2.5.6dev.tar.gz]({{postgis.dev_download}}/postgis-2.5.6dev.tar.gz)
-* [postgis-2.4.10dev.tar.gz]({{postgis.dev_download}}/postgis-2.4.10dev.tar.gz)
+{{< sourcelinks stable>}}
 
 
 A complete set of historical releases are available in the [source download directory]({{postgis.release_source}}).  Logos are available in the [logo directory](http://download.osgeo.org/postgis/logo_suite/).
diff --git a/layouts/shortcodes/doclinks.html b/layouts/shortcodes/doclinks.html
index 6191a53..45b063b 100644
--- a/layouts/shortcodes/doclinks.html
+++ b/layouts/shortcodes/doclinks.html
@@ -1,11 +1,12 @@
-{{ $md := $.Site.Params.postgis.dev_releases }}
+{{ $md := $.Site.Params.postgis.releases }}
 {{ $ver :=  (.Get 0)  }}
-{{ range $key, $value := $md}}
+{{ range sort $md "minor" "desc"}}
+{{ $key := .minor }}
 	{{ if ( and (eq $key "dev") (eq $ver "dev") )   }}
 * PostGIS {{ $key }} HTML: <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}">en</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-ja.html">ja</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-br.html">br</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-de.html">de</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-ko_KR.html">ko_KR</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-es.html">es</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-it.html">it</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-fr.html">fr</a>
 * PostGIS {{ $key }} PDF: <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}.pdf">en</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-ja.pdf">ja</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-br.pdf">br</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-de.pdf">de</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-ko_KR.pdf">ko_KR</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-es.pdf">es</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-it.pdf">it</a> <a href="{{ $.Site.Params.baseurl }}docs/manual-{{ $key }}/postgis-fr.pdf">fr</a>
 	{{ end }}
-	{{ if ( and (ne $key "dev") (eq $ver "stable")  )  }}
+	{{ if ( and (ne $key "dev") (eq $ver "stable") (ne .eol true )  ) }}
 * PostGIS {{ $key }} ([HTML]({{ $.Site.Params.baseurl }}docs/manual-{{ $key }})) ([PDF]({{ $.Site.Params.baseurl }}stuff/postgis-{{ $key }}.pdf)) ([EPUB]({{ $.Site.Params.baseurl }}stuff/postgis-{{ $key }}.epub))
 	{{ end }}
 
diff --git a/layouts/shortcodes/sourcelinks.html b/layouts/shortcodes/sourcelinks.html
index da3d9d6..e4fa09c 100644
--- a/layouts/shortcodes/sourcelinks.html
+++ b/layouts/shortcodes/sourcelinks.html
@@ -1,7 +1,15 @@
 {{ $ver :=  (.Get 0)  }}
 {{ $md := $.Site.Params.postgis.releases }}
-{{ range $key := $md }}
-* [postgis-{{ $key }}.tar.gz]({{ $.Site.Params.postgis.release_source }}/postgis-{{ $key }}.tar.gz) [md5]({{$.Site.Params.postgis.dev_download}}/postgis-{{ $key }}.tar.gz.md5) [pdf]({{ $.Site.Params.postgis.release_docs }}/postgis-{{ $key}}.pdf) [html]({{$.Site.Params.postgis.release_docs}}/doc-html-{{ $key }}.tar.gz) ([Release Notes]({{ $.Site.Params.postgis.release_notes }}/{{ $key }}/NEWS))
+{{ range sort $md "minor" "desc"}}
+
+	{{ if ( or ( and (eq .minor "dev") (eq $ver "dev") ) ( and (eq $ver "stable") (ne .minor "dev") (ne .eol true) )   )   }}
+		{{ $key := .dev }}
+* [postgis-{{ $key }}.tar.gz]({{ $.Site.Params.postgis.dev_download }}/postgis-{{ $key }}.tar.gz)
+	{{ end }}
+	{{ if ( and (eq $ver "release") (ne .minor "dev")  )  }}
+		{{ $key := .tag }}
+* [postgis-{{ $key }}.tar.gz {{ if .eol}} EOL{{ end }}]({{ $.Site.Params.postgis.release_source }}/postgis-{{ $key }}.tar.gz) [md5]({{$.Site.Params.postgis.dev_download}}/postgis-{{ $key }}.tar.gz.md5) [pdf]({{ $.Site.Params.postgis.release_docs }}/postgis-{{ $key}}.pdf) [html]({{$.Site.Params.postgis.release_docs}}/doc-html-{{ $key }}.tar.gz) ([Release Notes]({{ $.Site.Params.postgis.release_notes }}/{{ $key }}/NEWS))
+	{{end}}
 {{ end }}
 
 

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

Summary of changes:
 config/_default/params.toml         | 38 +++++++++++++++++++++++++++++--------
 content/pages/source.md             | 12 ++++--------
 layouts/shortcodes/doclinks.html    |  7 ++++---
 layouts/shortcodes/sourcelinks.html | 12 ++++++++++--
 4 files changed, 48 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
postgis.net


More information about the postgis-tickets mailing list