What's Changed
-
Version.njk: Update to container version 4bebc96 @makubacki (#384)
Change Details
Main reason to update is to pick up the latest Ubuntu container build that uses Python 3.12.
A complete list of changes compared to the previous container version (
d1e4ff1) is in:
-
.sync/Dockerfile: Add Python 3.12 installation steps @makubacki (#383)
Change Details
Some additional steps are needed to move the container build to Python 3.12.
The Deadsnakes PPA is needed to get Python 3.12. Add a step to add that repo and then use apt to install Python 3.12 from it. gnupg is needed to add the key for Deadsnakes. Distutils was removed from Python 3.12 but we still need it to build QEMU so that is added as a separate installation.
Changes tested in #382
🚀 Features & ✨ Enhancements
-
Add release branch backport workflow @makubacki (#386)
Change Details
Closes #372
This new workflow will attempt to automatically cherry-pick marked contributions to a development branch to its corresponding release branch. If a merge conflict occurs, the commit is committed to a new branch with merge markers and then a PR is created into the target branch with those markers. The PR is labeled with
type:release-merge-conflictto indicate that it needs manual resolution.The PR (if created) is expected to fail compilation and status checks of course due to the merge conflict markers. A human should then checkout the PR branch, resolve the conflicts, and push the changes back to the PR branch.
- To mark a PR going into the development branch so that it should be cherry-picked to the release branch, add the
type:backportlabel to the PR.
Notes:
- The workflow is synced to all repos that currently have a
devbranch. - Each repo that
backport-to-release-branch.ymlis synced to must have aCHERRY_PICK_TOKENdefined with repo write permission.
- To mark a PR going into the development branch so that it should be cherry-picked to the release branch, add the
Full Changelog: v12.2.0...v12.3.0
