From ad05a1b83b4576a14e48d9b1365f6a5d0d0ae079 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 19 May 2026 14:34:38 +0200 Subject: [PATCH] docs/releases/timeline: add numbers before phases Adjust the timeline docs and release infrastructure template to have numbers before the phases. This makes clearer where the next phase begins in the long infrastructure issue template. Signed-off-by: Oliver Smith Part-of: --- .gitlab/issue_templates/Release_Infrastructure.md | 10 +++++----- docs/releases/timeline.md | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab/issue_templates/Release_Infrastructure.md b/.gitlab/issue_templates/Release_Infrastructure.md index 1d754dfdc..6ff8308f0 100644 --- a/.gitlab/issue_templates/Release_Infrastructure.md +++ b/.gitlab/issue_templates/Release_Infrastructure.md @@ -8,14 +8,14 @@ Person in charge of the release (doesn't have to do all the work, but has to push it forward): -### Preparation +### 0. Preparation - [ ] Create the gitlab milestone for the release - [ ] Add this infrastructure issue to the milestone - [ ] Update the [timeline](https://docs.postmarketos.org/policies-and-processes/development/releases/current-timeline.html) for the next release -### Pre-Build phase +### 1. Pre-Build phase This phase is to get some extra time for building packages. The branch will be rebased once in the branch phase. @@ -129,7 +129,7 @@ This phase is to get some extra time for building packages. The branch will be r - [ ] Set the wallpaper that won in the poll in edge, backport this change to the stable release branch -### Branch phase +### 2. Branch phase #### Rebase on main - [ ] `git checkout vYY.MM` @@ -149,7 +149,7 @@ This phase is to get some extra time for building packages. The branch will be r - [ ] Ensure that a pmbootstrap release been made with the apk-tools min version change -### Test phase +### 3. Test phase - [ ] Create an issue in pmaports with a checklist of devices and UIs in main and community (see previous issue for reference) - Tag the testers of each device and UI @@ -164,7 +164,7 @@ This phase is to get some extra time for building packages. The branch will be r intended for the upcoming release - [ ] Add new version to the pmaports gitlab issue template (.gitlab dir) -### Release phase +### 4. Release phase - [ ] Did a reasonable amount of devices get tested? (we may consider dropping devices that were not tested) - [ ] Make sure all fixes are in diff --git a/docs/releases/timeline.md b/docs/releases/timeline.md index b4902dfbf..1b9a96ffa 100644 --- a/docs/releases/timeline.md +++ b/docs/releases/timeline.md @@ -5,7 +5,7 @@ release cycle starts. Get the current CW with `date +%V`. During the release cycle we try to follow this plan closely, but it can happen that we run over the planned CWs. -## Pre-Build +## 1. Pre-Build CW 21 (2026-05-18 - 2026-05-24) @@ -20,7 +20,7 @@ Team: * Create the release branch in pmaports. * Start building of binary packages early, so we can get through it for sure. -## Branch +## 2. Branch CW 22 (2026-05-25 - 2026-05-31), CW 23 (2026-06-01 - 2026-06-07) @@ -34,7 +34,7 @@ Team: * Rebase the release branch on main once * Build binary packages and images (configure BPO for that) -## Test +## 3. Test CW 24 (2026-06-08 - 2026-06-14) @@ -45,7 +45,7 @@ Maintainers: * Fix stuff that is broken by creating MRs against pmaports main and assigning the `backport-to-YY.MM` label -## Release +## 4. Release CW 25 (2026-06-15 - 2026-06-21)