Skip to content

Commit cc8f17e

Browse files
authored
Merge pull request #2981 from mame/expected_eol_date
Add "expected_eol_date"
2 parents 61f8027 + f4a0559 commit cc8f17e

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

_data/branches.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,28 @@
1313
date: 2022-12-25
1414
security_maintenance_date:
1515
eol_date:
16+
expected_eol_date: 2026-03-31
1617

1718
- name: 3.1
1819
status: normal maintenance
1920
date: 2021-12-25
2021
security_maintenance_date:
2122
eol_date:
23+
expected_eol_date: 2025-03-31
2224

2325
- name: 3.0
2426
status: normal maintenance
2527
date: 2020-12-25
2628
security_maintenance_date:
2729
eol_date:
30+
expected_eol_date: 2024-03-31
2831

2932
- name: 2.7
3033
status: security maintenance
3134
date: 2019-12-25
3235
security_maintenance_date: 2022-04-01
3336
eol_date:
37+
expected_eol_date: 2023-03-31
3438

3539
- name: 2.6
3640
status: eol

en/downloads/branches/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ the following phases:
4040
status: {{ branch.status }}<br>
4141
release date: {{ branch.date }}<br>
4242
normal maintenance until: {% if branch.security_maintenance_date %}{{ branch.security_maintenance_date }}{% else %}TBD{% endif %}<br>
43-
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}TBD{% endif %}
43+
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}{% if branch.expected_eol_date %}{{ branch.expected_eol_date }} (expected){% else %}TBD{% endif %}{% endif %}
4444

4545
{% endfor %}

ja/downloads/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ Windows向けのバイナリが有志により配布されています。
8989
ステータス: {{ branch.status }}<br>
9090
リリース: {{ branch.date }}<br>
9191
通常メンテナンス終了: {% if branch.security_maintenance_date %}{{ branch.security_maintenance_date }}{% else %}TBD{% endif %}<br>
92-
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}TBD{% endif %}
92+
EOL: {% if branch.eol_date %}{{ branch.eol_date }}{% else %}{% if branch.expected_eol_date %}{{ branch.expected_eol_date }}(見込み){% else %}TBD{% endif %}{% endif %}
9393

9494
{% endfor %}

javascripts/branch-timeline.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
...e,
1313
date: new Date(e.date),
1414
security_maintenance_date: e.security_maintenance_date ? new Date(e.security_maintenance_date) : null,
15-
eol_date: e.eol_date ? new Date(e.eol_date) : null
15+
eol_date: e.eol_date ? new Date(e.eol_date) : e.expected_eol_date ? new Date(e.expected_eol_date) : null
1616
};
1717
});
1818
const container = document.getElementById('lifecycle-timeline');

0 commit comments

Comments
 (0)