Skip to content
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

Add upcoming monthly releases to schedule.yaml #45770

Merged
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
6 changes: 1 addition & 5 deletions content/en/releases/patch-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ Timelines may vary with the severity of bug fixes, but for easier planning we
will target the following monthly release points. Unplanned, critical
releases may also occur in between these.

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

## Detailed Release History for Active Branches

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

<!--
| Monthly Patch Release | Cherry Pick Deadline | Target date |
| --------------------- | -------------------- | ----------- |
| March 2024 | 2024-03-08 | 2024-03-13 |
| April 2024 | 2024-04-12 | 2024-04-17 |
| May 2024 | 2024-05-10 | 2024-05-15 |
-->
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
|--------------|---------------------|-------------|
| 2024 年 3 月 | 2024-03-08 | 2024-03-13 |
| 2024 年 4 月 | 2024-04-12 | 2024-04-17 |
| 2024 年 5 月 | 2024-05-10 | 2024-05-15 |
{{< upcoming-releases >}}

<!--
## Detailed Release History for Active Branches
Expand Down
6 changes: 6 additions & 0 deletions data/i18n/en/en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ other = "Read about"
[main_read_more]
other = "Read more"

[monthly_patch_release]
other = "Monthly Patch Release"

[not_applicable]
# Localization teams: it's OK to use a longer text here
other = "n/a"
Expand Down Expand Up @@ -504,6 +507,9 @@ other = "(released: "
[release_date_format]
other = "2006-01-02"

[release_date_format_month]
other = "January 2006"

[release_cherry_pick_deadline]
other = "Cherry Pick Deadline"

Expand Down
27 changes: 27 additions & 0 deletions layouts/shortcodes/upcoming-releases.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<div>
<table class="table table-striped col-md-9">
<thead class="thead">
<tr>
<th>{{ T "monthly_patch_release" }}</th>
<th>{{ T "release_cherry_pick_deadline" }}</th>
<th>{{ T "release_target_date" }}</th>
</tr>
</thead>
<tbody>
{{ range $patchReleaseInfo :=
.Site.Data.releases.schedule.upcoming_releases }}
<tr>
<td>
{{ time.Format ( T "release_date_format_month") $patchReleaseInfo.targetDate }}
</td>
<td>
{{ time.Format ( T "release_date_format") $patchReleaseInfo.cherryPickDeadline }}
</td>
<td>
{{ time.Format ( T "release_date_format") $patchReleaseInfo.targetDate }}
</td>
</tr>
{{ end }}
</tbody>
</table>
</div>