Skip to content

Commit e7896c2

Browse files
authored
Merge pull request #45770 from saschagrunert/schedule-builder-upcoming
Add upcoming monthly releases to schedule.yaml
2 parents a2d0b70 + a7993c7 commit e7896c2

File tree

4 files changed

+35
-17
lines changed

4 files changed

+35
-17
lines changed

content/en/releases/patch-releases.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ Timelines may vary with the severity of bug fixes, but for easier planning we
7676
will target the following monthly release points. Unplanned, critical
7777
releases may also occur in between these.
7878

79-
| Monthly Patch Release | Cherry Pick Deadline | Target date |
80-
| --------------------- | -------------------- | ----------- |
81-
| April 2024 | 2024-04-12 | 2024-04-16 |
82-
| May 2024 | 2024-05-10 | 2024-05-14 |
83-
| June 2024 | 2024-06-07 | 2024-06-11 |
79+
{{< upcoming-releases >}}
8480

8581
## Detailed Release History for Active Branches
8682

content/zh-cn/releases/patch-releases.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,7 @@ releases may also occur in between these.
146146
时间表可能会因错误修复的严重程度而有所不同,但为了便于规划,我们每月将按照以下时间点进行发布。
147147
中间可能会发布一些计划外的关键版本。
148148

149-
<!--
150-
| Monthly Patch Release | Cherry Pick Deadline | Target date |
151-
| --------------------- | -------------------- | ----------- |
152-
| March 2024 | 2024-03-08 | 2024-03-13 |
153-
| April 2024 | 2024-04-12 | 2024-04-17 |
154-
| May 2024 | 2024-05-10 | 2024-05-15 |
155-
-->
156-
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
157-
|--------------|---------------------|-------------|
158-
| 2024 年 3 月 | 2024-03-08 | 2024-03-13 |
159-
| 2024 年 4 月 | 2024-04-12 | 2024-04-17 |
160-
| 2024 年 5 月 | 2024-05-10 | 2024-05-15 |
149+
{{< upcoming-releases >}}
161150

162151
<!--
163152
## Detailed Release History for Active Branches

data/i18n/en/en.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,9 @@ other = "Read about"
393393
[main_read_more]
394394
other = "Read more"
395395

396+
[monthly_patch_release]
397+
other = "Monthly Patch Release"
398+
396399
[not_applicable]
397400
# Localization teams: it's OK to use a longer text here
398401
other = "n/a"
@@ -504,6 +507,9 @@ other = "(released: "
504507
[release_date_format]
505508
other = "2006-01-02"
506509

510+
[release_date_format_month]
511+
other = "January 2006"
512+
507513
[release_cherry_pick_deadline]
508514
other = "Cherry Pick Deadline"
509515

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div>
2+
<table class="table table-striped col-md-9">
3+
<thead class="thead">
4+
<tr>
5+
<th>{{ T "monthly_patch_release" }}</th>
6+
<th>{{ T "release_cherry_pick_deadline" }}</th>
7+
<th>{{ T "release_target_date" }}</th>
8+
</tr>
9+
</thead>
10+
<tbody>
11+
{{ range $patchReleaseInfo :=
12+
.Site.Data.releases.schedule.upcoming_releases }}
13+
<tr>
14+
<td>
15+
{{ time.Format ( T "release_date_format_month") $patchReleaseInfo.targetDate }}
16+
</td>
17+
<td>
18+
{{ time.Format ( T "release_date_format") $patchReleaseInfo.cherryPickDeadline }}
19+
</td>
20+
<td>
21+
{{ time.Format ( T "release_date_format") $patchReleaseInfo.targetDate }}
22+
</td>
23+
</tr>
24+
{{ end }}
25+
</tbody>
26+
</table>
27+
</div>

0 commit comments

Comments
 (0)