Skip to content

Add "expected_eol_date" #2981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions _data/branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,28 @@
date: 2022-12-25
security_maintenance_date:
eol_date:
expected_eol_date: 2026-03-31

- name: 3.1
status: normal maintenance
date: 2021-12-25
security_maintenance_date:
eol_date:
expected_eol_date: 2025-03-31

- name: 3.0
status: normal maintenance
date: 2020-12-25
security_maintenance_date:
eol_date:
expected_eol_date: 2024-03-31

- name: 2.7
status: security maintenance
date: 2019-12-25
security_maintenance_date: 2022-04-01
eol_date:
expected_eol_date: 2023-03-31

- name: 2.6
status: eol
Expand Down
2 changes: 1 addition & 1 deletion en/downloads/branches/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ the following phases:
status: {{ branch.status }}<br>
release date: {{ branch.date }}<br>
normal maintenance until: {% if branch.security_maintenance_date %}{{ branch.security_maintenance_date }}{% else %}TBD{% endif %}<br>
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}TBD{% endif %}
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}{% if branch.expected_eol_date %}{{ branch.expected_eol_date }} (expected){% else %}TBD{% endif %}{% endif %}

{% endfor %}
2 changes: 1 addition & 1 deletion ja/downloads/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ Windows向けのバイナリが有志により配布されています。
ステータス: {{ branch.status }}<br>
リリース: {{ branch.date }}<br>
通常メンテナンス終了: {% if branch.security_maintenance_date %}{{ branch.security_maintenance_date }}{% else %}TBD{% endif %}<br>
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}TBD{% endif %}
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}{% if branch.expected_eol_date %}{{ branch.expected_eol_date }}(見込み){% else %}TBD{% endif %}{% endif %}

{% endfor %}
2 changes: 1 addition & 1 deletion javascripts/branch-timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
...e,
date: new Date(e.date),
security_maintenance_date: e.security_maintenance_date ? new Date(e.security_maintenance_date) : null,
eol_date: e.eol_date ? new Date(e.eol_date) : null
eol_date: e.eol_date ? new Date(e.eol_date) : e.expected_eol_date ? new Date(e.expected_eol_date) : null
};
});
const container = document.getElementById('lifecycle-timeline');
Expand Down