git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #124273 from NixOS/backporting-action

Add backporting action

commitd71078f4f403c749dad94552be2b9b51c378879e authorDomen Kožar <domen@dev.si> dateTue 25 May 2021, 11:38 (5 years ago) parent1ab8b0251c7afa
2 files changed+24
.github/workflows/backport.yml+22 doc/contributing/submitting-changes.chapter.md+2
.github/workflows/backport.ymlnew file+22
@@ -0,0 +1,22 @@
1+name: Backport
2+on:
3+ pull_request:
4+ types: [closed]
5+jobs:
6+ backport:
7+ name: Create backport PRs
8+ if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true
9+ runs-on: ubuntu-latest
10+ steps:
11+ - uses: actions/checkout@v2
12+ with:
13+ # required to find all branches
14+ fetch-depth: 0
15+ - name: Create backport PRs
16+ # should be kept in sync with `version`
17+ uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd
18+ with:
19+ github_token: ${{ secrets.GITHUB_TOKEN }}
20+ github_workspace: ${{ github.workspace }}
21+ # should be kept in sync with `uses`
22+ version: 9b8949dcd4295d364b0939f07d0c7593598d26cd
doc/contributing/submitting-changes.chapter.md+2
@@ -248,6 +248,8 @@ For cherry-picking a commit to a stable release branch (“backporting”), use
248248
249249Add a reason for the backport by using `git cherry-pick -xe <original commit>` instead when it is not obvious from the original commit message. It is not needed when it's a minor version update that includes security and bug fixes but don't add new features or when the commit fixes an otherwise broken package.
250250
251+For backporting Pull Requests to stable branches, assign label `backport <branch>` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged.
252+
251253Here is an example of a cherry-picked commit message with good reason description:
252254
253255```