Merge pull request #128163 from nh2/github-actions-backport-link-to-criteria

Make backport bot link to criteria, make `CONTRIBUTING.md` more prominent

authored by

Domen Kožar and committed by
GitHub
6556d64f 3c9af50b

+13 -7
.github/CONTRIBUTING.md CONTRIBUTING.md
+2 -2
.github/PULL_REQUEST_TEMPLATE.md
··· 23 23 - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) 24 24 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` 25 25 - [ ] Tested execution of all binary files (usually in `./result/bin/`) 26 - - [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#generating-2111-release-notes) 26 + - [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) 27 27 - [ ] (Package updates) Added a release notes entry if the change is major or breaking 28 28 - [ ] (Module updates) Added a release notes entry if the change is significant 29 29 - [ ] (Module addition) Added a release notes entry if adding a new NixOS module 30 - - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). 30 + - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
+8 -2
.github/workflows/backport.yml
··· 15 15 ref: ${{ github.event.pull_request.head.sha }} 16 16 - name: Create backport PRs 17 17 # should be kept in sync with `version` 18 - uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd 18 + uses: zeebe-io/backport-action@2b994724142df0774855690db56bc6308fb99ffa 19 19 with: 20 + # Config README: https://github.com/zeebe-io/backport-action#backport-action 20 21 github_token: ${{ secrets.GITHUB_TOKEN }} 21 22 github_workspace: ${{ github.workspace }} 22 23 # should be kept in sync with `uses` 23 - version: 9b8949dcd4295d364b0939f07d0c7593598d26cd 24 + version: 2b994724142df0774855690db56bc6308fb99ffa 25 + pull_description: |- 26 + Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. 27 + 28 + * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes). 29 + * Even as a non-commiter, if you find that it does not comply, leave a comment.
+1 -1
README.md
··· 87 87 deemed of sufficiently high quality 88 88 89 89 For more information about contributing to the project, please visit 90 - the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). 90 + the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). 91 91 92 92 # Donations 93 93
+2 -2
doc/contributing/submitting-changes.chapter.md
··· 62 62 63 63 - Push your changes to your fork of nixpkgs. 64 64 - Create the pull request 65 - - Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes). 65 + - Follow [the contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#submitting-changes). 66 66 67 67 ## Submitting security fixes {#submitting-changes-submitting-security-fixes} 68 68 ··· 193 193 194 194 ### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards} 195 195 196 - The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. 196 + The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. 197 197 198 198 ## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests} 199 199