Fix release sorting

Xubuntu · Oct 7, 2024 · 0b6eb4a · 0b6eb4a
1 parent 4290516
commit 0b6eb4a
Show file tree

Hide file tree

Showing 44 changed files with 73 additions and 75 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,18 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     coffee-script (2.4.1)
@@ -21,9 +22,9 @@ GEM
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    dnsruby (1.72.1)
+    dnsruby (1.72.2)
       simpleidn (~> 0.2.1)
     drb (2.2.1)
     em-websocket (0.5.3)
@@ -33,11 +34,13 @@ GEM
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
       net-http
-    ffi (1.16.3)
+    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
     github-pages (231)
@@ -95,7 +98,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.5)
       addressable (~> 2.4)
@@ -206,6 +209,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -214,28 +218,28 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.5)
-    racc (1.7.3)
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.3.8)
     rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
@@ -247,20 +251,17 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.2)
-      unf (~> 0.1.4)
+    securerandom (0.3.1)
+    simpleidn (0.2.3)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    uri (0.13.0)
-    webrick (1.8.1)
+    uri (0.13.1)
+    webrick (1.8.2)
 
 PLATFORMS
   x86_64-linux

diff --git a/_includes/layout/footer.html b/_includes/layout/footer.html
@@ -5,8 +5,8 @@
          <section class="columns-2">
             {%- include layout/nav.html -%}
             <div>
-               {%- assign latest_release = site.releases | sort_natural: 'version' | reverse | first -%}
-               <a href="{{ latest_release.url | relative_url }}">{{ latest_release.title }}</a>
+               {%- assign latest_release = site.releases | sort: 'date_rel' | reverse | first -%}
+               <a href="{{ release.url | relative_url }}">{{ latest_release.title }}</a>
                <a href="{{ "/releases" | relative_url }}">All releases</a>
             </div>
          </section>

diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -14,7 +14,6 @@ <h1>
          <ul class="meta">
             <li>{{ post.date | date: site.date_format }}</li>
             {%- if post.release -%}
-            {{ post.release }}
                {%- capture release_link -%}/release/{{ post.release }}{%- endcapture -%}
                <li><a href="{{ release_link | relative_url }}">{{ post.release }}</a></li>
             {%- endif -%}

diff --git a/_layouts/download.html b/_layouts/download.html
@@ -5,7 +5,7 @@
 <section>
    <h2>{{ page.title }}</h2>
    {%- assign today = site.time | date: '%Y-%m-%d' -%}
-   {%- assign releases = site.releases | sort_natural: 'version' | reverse -%}
+   {%- assign releases = site.releases | sort: 'date_rel' | reverse -%}
    {%- for release in releases -%}
       {%- assign release_eol = release.date_eol | date: '%Y-%m-%d' -%}
       {%- if release_eol > today -%}

diff --git a/_layouts/release.html b/_layouts/release.html
@@ -8,8 +8,8 @@ <h2>{{ page.title }}</h2>
 
    <dl class="release-info">
       <dt>Codename</dt><dd>{{ page.codename }}</dd>
-      <dt>Release Date</dt><dd>{{ page.date_rel }}</dd>
-      <dt>End of Life</dt><dd>{{ page.date_eol }}</dd>
+      <dt>Release Date</dt><dd>{{ page.date_rel | date: site.date_format }}</dd>
+      <dt>End of Life</dt><dd>{{ page.date_eol | date: site.date_format }}</dd>
       {%- assign docs = site.releasedocs | where: "release", page.version -%}
       {%- if docs.size > 1 -%}
          <dt>Release Links</dt><dd>

diff --git a/_layouts/releases.html b/_layouts/releases.html
@@ -8,7 +8,7 @@ <h2>{{ page.title }}</h2>
 </section>
 <section>
    {%- assign today = site.time | date: '%Y-%m-%d' -%}
-   {%- assign releases = site.releases | sort_natural: 'version' | reverse -%}
+   {%- assign releases = site.releases | sort: 'date_rel' | reverse -%}
 
    <h3>Supported Releases</h3>
    {%- for release in releases -%}

diff --git a/_releases/10.04.md b/_releases/10.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 10.04
-version:       10.04
+version:       "10.04"
 version_point:
 codename:      Lucid Lynx
 codename_slug: lucid

diff --git a/_releases/10.10.md b/_releases/10.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 10.10
-version:       10.10
+version:       "10.10"
 version_point:
 codename:      Maverick Meerkat
 codename_slug: maverick

diff --git a/_releases/11.04.md b/_releases/11.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 11.04
-version:       11.04
+version:       "11.04"
 version_point:
 codename:      Natty Narwhal
 codename_slug: natty

diff --git a/_releases/11.10.md b/_releases/11.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 11.10
-version:       11.10
+version:       "11.10"
 version_point:
 codename:      Oneiric Ocelot
 codename_slug: oneiric

diff --git a/_releases/12.04.md b/_releases/12.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 12.04
-version:       12.04
+version:       "12.04"
 version_point: 12.04.4
 codename:      Precise Pangolin
 codename_slug: precise

diff --git a/_releases/12.10.md b/_releases/12.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 12.10
-version:       12.10
+version:       "12.10"
 version_point:
 codename:      Quantal Quetzal
 codename_slug: quantal

diff --git a/_releases/13.04.md b/_releases/13.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 13.04
-version:       13.04
+version:       "13.04"
 version_point:
 codename:      Raring Ringtail
 codename_slug: raring

diff --git a/_releases/13.10.md b/_releases/13.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 13.10
-version:       13.10
+version:       "13.10"
 version_point:
 codename:      Saucy Salamanfer
 codename_slug: saucy

diff --git a/_releases/14.04.md b/_releases/14.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 14.04
-version:       14.04
+version:       "14.04"
 version_point: 14.04.2
 codename:      Trusty Tahr
 codename_slug: trusty

diff --git a/_releases/14.10.md b/_releases/14.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 14.10
-version:       14.10
+version:       "14.10"
 version_point:
 codename:      Utopic Unicorn
 codename_slug: utopic

diff --git a/_releases/15.04.md b/_releases/15.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 15.04
-version:       15.04
+version:       "15.04"
 version_point:
 codename:      Vivid Vervet
 codename_slug: vivid

diff --git a/_releases/15.10.md b/_releases/15.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 15.10
-version:       15.10
+version:       "15.10"
 version_point:
 codename:      Wily Werewolf
 codename_slug: wily

diff --git a/_releases/16.04.md b/_releases/16.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 16.04
-version:       16.04
+version:       "16.04"
 version_point: 16.04.1
 codename:      Xenial Xerus
 codename_slug: xenial

diff --git a/_releases/16.10.md b/_releases/16.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 16.10
-version:       16.10
+version:       "16.10"
 version_point:
 codename:      Yakkety Yak
 codename_slug: yakkety

diff --git a/_releases/17.04.md b/_releases/17.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 17.04
-version:       17.04
+version:       "17.04"
 version_point:
 codename:      Zesty Zapus
 codename_slug: zesty

diff --git a/_releases/17.10.md b/_releases/17.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 17.10
-version:       17.10
+version:       "17.10"
 version_point: 17.10.1
 codename:      Artful Aardvark
 codename_slug: artful

diff --git a/_releases/18.04.md b/_releases/18.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 18.04
-version:       18.04
+version:       "18.04"
 version_point:
 codename:      Bionic Beaver
 codename_slug: bionic

diff --git a/_releases/18.10.md b/_releases/18.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 18.10
-version:       18.10
+version:       "18.10"
 version_point:
 codename:      Cosmic Cuttlefish
 codename_slug: cosmix

diff --git a/_releases/19.04.md b/_releases/19.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 19.04
-version:       19.04
+version:       "19.04"
 version_point:
 codename:      Disco Dingo
 codename_slug: disco

diff --git a/_releases/19.10.md b/_releases/19.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 19.10
-version:       19.10
+version:       "19.10"
 version_point:
 codename:      Eoan Ermine
 codename_slug: eoan

diff --git a/_releases/20.04.md b/_releases/20.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 20.04
-version:       20.04
+version:       "20.04"
 version_point:
 codename:      Focal Fossa
 codename_slug: focal

diff --git a/_releases/21.04.md b/_releases/21.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 21.04
-version:       21.04
+version:       "21.04"
 version_point:
 codename:      Hirsute Hippo
 codename_slug: hirsute

diff --git a/_releases/21.10.md b/_releases/21.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 21.10
-version:       21.10
+version:       "21.10"
 version_point:
 codename:      Impish Indri
 codename_slug: impish

diff --git a/_releases/22.04.md b/_releases/22.04.md
@@ -1,7 +1,7 @@
 ---
 title:         Xubuntu 22.04
-version:       22.04
-version_point: 4
+version:       "22.04"
+version_point: 22.04.4
 codename:      Jammy Jellyfish
 codename_slug: jammy
 date_rel:      2022-04-21

diff --git a/_releases/22.10.md b/_releases/22.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 22.10
-version:       22.10
+version:       "22.10"
 version_point:
 codename:      Kinetic Kudu
 codename_slug: kinetic

diff --git a/_releases/23.04.md b/_releases/23.04.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 23.04
-version:       23.04
+version:       "23.04"
 version_point:
 codename:      Lunar Lobster
 codename_slug: lunar

diff --git a/_releases/23.10.md b/_releases/23.10.md
@@ -1,6 +1,6 @@
 ---
 title:         Xubuntu 23.10
-version:       23.10
+version:       "23.10"
 version_point:
 codename:      Mantic Minotaur
 codename_slug: mantic