diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 00000000000..69da652ba59 --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,22 @@ +name: Backport +on: + pull_request: + types: [closed] +jobs: + backport: + name: Create backport PRs + if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + # required to find all branches + fetch-depth: 0 + - name: Create backport PRs + # should be kept in sync with `version` + uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + github_workspace: ${{ github.workspace }} + # should be kept in sync with `uses` + version: 9b8949dcd4295d364b0939f07d0c7593598d26cd diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index b462caf8670..0a465020092 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -248,6 +248,8 @@ For cherry-picking a commit to a stable release branch (“backporting”), use Add a reason for the backport by using `git cherry-pick -xe ` 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. +For backporting Pull Requests to stable branches, assign label `backport ` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged. + Here is an example of a cherry-picked commit message with good reason description: ```