Skip to content

Commit 96ef87a

Browse files
madolsonranshid
andauthored
Skip release candidates when on downloads page (#210)
### Description For 8.0, we didn't have the release candidates on the release page, which I think was a miss. This new version now shows each major/minor pair on the all releases page and in addition also only shows the non-rc candidate versions on the downloads page. ### Issues Resolved <!-- List any issues this PR will resolve. --> <!-- Example: closes #1234 --> ### Check List - [X] Commits are signed per the DCO using `--signoff` By submitting this pull request, I confirm that my contribution is made under the terms of the BSD-3-Clause License. Signed-off-by: Madelyn Olson <[email protected]> Co-authored-by: Ran Shidlansik <[email protected]>
1 parent 402d6c7 commit 96ef87a

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

templates/download.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,16 @@ <h1 class="page-title">Download Latest</h1>
66
{% block main_content %}
77

88
{% set release_section = get_section(path="download/releases/_index.md") %}
9-
{% set most_recent_release_page = release_section.pages | reverse | slice(end= 1) %}
9+
{% set releases = release_section.pages | reverse %}
10+
11+
{% set_global active_releases = [] %}
12+
{% for release in releases %}
13+
{% if release.extra.tag is not matching(".*-.*") %}
14+
{% set_global active_releases = active_releases | concat(with=release) %}
15+
{% endif %}
16+
{% endfor %}
17+
18+
{% set most_recent_release_page = active_releases | slice(end= 1) %}
1019
{% set release_date = most_recent_release_page[0].date %}
1120
{% set release = most_recent_release_page[0].extra %}
1221

@@ -26,7 +35,7 @@ <h3> Version {{major}}.x.x </h3>
2635

2736
<h2> Latest supported version of past releases</h2>
2837

29-
{% for older_release in release_section.pages | reverse %}
38+
{% for older_release in active_releases %}
3039
{% set older_split_ver = older_release.extra.tag | split(pat=".")%}
3140
{% set older_major = older_split_ver | nth(n= 0) %}
3241
{% if older_major != major %}

templates/release-section.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,22 @@ <h1 class="page-title">Valkey Releases</h1>
1414
{% set major = split_ver | nth(n= 0) %}
1515
{% set minor = split_ver | nth(n= 1) %}
1616
{% set patch = split_ver | nth(n= 2) %}
17+
{% set header = major ~ "." ~ minor %}
1718

18-
19-
{% set_global release_lines = release_lines | concat(with=major) %}
19+
{% set_global release_lines = release_lines | concat(with=header) %}
2020
{% endfor %}
2121

2222
{% set release_lines_unique = release_lines | unique %}
2323
{% for line in release_lines_unique %}
24-
<h2>{{ line }}.x.x</h2>
24+
<h2>{{ line }}.x</h2>
2525
<ul>
2626
{% for release in section.pages | reverse %}
2727
{% set split_ver = release.extra.tag | split(pat=".")%}
2828
{% set major = split_ver | nth(n= 0) %}
29+
{% set minor = split_ver | nth(n= 1) %}
30+
{% set header = major ~ "." ~ minor %}
2931

30-
{% if major == line %}
32+
{% if header == line %}
3133
<li><a href="{{ release.permalink }}"> {{ release.extra.tag }}</a> <small>(Released {{ release.date | date(format="%Y-%m-%d") }})</small></li>
3234
{% endif %}
3335
{% endfor %}

0 commit comments

Comments
 (0)