(apologies this one is sent out of chronological order, it was completely missed. but... better late than never)
# 2th November, 21:00 - 22:00 UTC+0
Attendees: Felix, Angel, Edward, Anastasia, Stefan
## Decision summary
* Angel: See the ALL CAPS text at the start of the page. Thanks to aklm for the idea. We do not talk about others if they’re not present on the call. Mentioning people who did something, for context, is fine. * We created the release branch today and will be doing all the fixes/reverts into the release branch. Meanwhile development continues on master. * Initially we wanted to create a release branch with the name “1.3.x” but then we discovered a branch with this name already exists (created an unknown number of months ago, and in an unknown state). Therefore, Angel created branch with name “1.3.x_infdev” and the plan is to rename the current 1.3.x to 1.3.x_old (to keep whatever is in there) and then rename 1.3.x_infdev to 1.3.x. * Angel made [https://review.coreboot.org/68823%5D(https://review.coreboot.org/68823) to deal with the sb600spi problems (“Promontory” support is broken), at least for the v1.3 release. A long-term plan is to fix the code.
## Agenda
* When can we make a release branch? * Aklm: can we make a plan? * Branch master ? * [Angel] We need this for the release: [https://review.coreboot.org/68823%5D(https://review.coreboot.org/68823) * Angel decided to create the `1.3.x_infdev` branch ([“infdev” is a reference to a Minecraft version](https://minecraft.fandom.com/wiki/Java_Edition_Infdev)) to be used as flashrom v1.3 release candidate. The already-present `1.3.x` branch is left untouched as we don’t know for sure whose it is. When the v1.3 release is done, Angel suggests keeping the `1.3.x_infdev` branch as a memento of the struggle. * Felix will figure out the status of the 1.3.x branch and what’s about it.
Hi list,
Some additional information regarding the release branch:
We're now using `1.3.x` as the release branch, and we deleted the `1.3.x_infdev` branch. It turns out that Nico had created the `1.3.x` branch for us (Angel) several years ago, but we never did anything with it. Also, we now have https://review.coreboot.org/q/topic:for_1.3.x for changes that should be cherry-picked into the `1.3.x` branch. These changes are limited to bug fixes and the like: new features and refactors should not be included into the release branch owing to the risk of introducing regressions. The `master` branch remains the "main entrance" for new commits into the tree, i.e. patches meant to land in `master` and `1.3.x` should be reviewed on the `master` branch first, and then cherry-picked to the `1.3.x` branch if necessary.
The idea of the `1.3.x` branch is to "calm down" the codebase in preparation for a release. In other words, the release branch should receive minimal updates (mainly bug fixes) and *lots* of testing. Consider it a "rolling-release release candidate" branch (if you can tolerate the pain of thinking about this vile expression). Testing and feedback regarding the `1.3.x` branch is very welcome (as is for the `master` branch).
Best regards,
Angel
-
Anastasia Klimchuk -
Angel Pons