diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/CODEOWNERS | 13 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/out_of_date_package_report.md | 48 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
| -rw-r--r-- | .github/STALE-BOT.md | 11 | ||||
| -rw-r--r-- | .github/workflows/editorconfig.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/merge-staging.yml | 39 |
6 files changed, 109 insertions, 8 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7d6d7205a144..9835b7654612 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,6 +12,7 @@ # GitHub actions /.github/workflows @Mic92 @zowoq +/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq @@ -176,6 +177,10 @@ /pkgs/applications/editors/emacs @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis +# Neovim +/pkgs/applications/editors/neovim @jonringer +/pkgs/applications/editors/neovim @teto + # VimPlugins /pkgs/misc/vim-plugins @jonringer @softinio @@ -202,8 +207,14 @@ /nixos/tests/cri-o.nix @NixOS/podman @zowoq /nixos/tests/podman.nix @NixOS/podman @zowoq +# Docker tools +/pkgs/build-support/docker @roberth @utdemir +/nixos/tests/docker-tools-overlay.nix @roberth +/nixos/tests/docker-tools.nix @roberth +/doc/builders/images/dockertools.xml @roberth + # Blockchains -/pkgs/applications/blockchains @mmahut +/pkgs/applications/blockchains @mmahut @RaghavSood # Go /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md new file mode 100644 index 000000000000..72c09a19c0e6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -0,0 +1,48 @@ +--- +name: Out-of-date package reports +about: For packages that are out-of-date +title: '' +labels: '9.needs: package (update)' +assignees: '' + +--- + + +###### Checklist + +<!-- Note that these are hard requirements --> + +<!-- +You can use the "Go to file" functionality on github to find the package +Then you can go to the history for this package +Find the latest "package_name: old_version -> new_version" commit +The "new_version" is the the current version of the package +--> +- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) +<!-- +Type the name of your package and try to find an open pull request for the package +If you find an open pull request, you can review it! +There's a high chance that you'll have the new version right away while helping the community! +--> +- [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls) + +###### Project name +`nix search` name: +<!-- +The current version can be found easily with the same process than above for checking the master branch +If an open PR is present for the package, take this version as the current one and link to the PR +--> +current version: +desired version: + +###### Notify maintainers +<!-- +Search your package here: https://search.nixos.org/packages?channel=unstable +If no maintainer is listed for your package, tag the person that last updated the package +--> + +maintainers: + +###### Note for maintainers + +Please tag this issue in your PR. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 48b84f8c36ce..ce630e77e940 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ comment describing what you have tested in the relevant package/service. Reviewing helps to reduce the average time-to-merge for everyone. Thanks a lot if you do! List of open PRs: https://github.com/NixOS/nixpkgs/pulls -Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions +Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions --> ###### Motivation for this change diff --git a/.github/STALE-BOT.md b/.github/STALE-BOT.md index 3b1599baebf8..7b3f013710a8 100644 --- a/.github/STALE-BOT.md +++ b/.github/STALE-BOT.md @@ -7,11 +7,12 @@ ## Suggestions for PRs -1. If it is unfinished but you plan to finish it, please mark it as a draft. -2. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work. -3. To get things rolling again, rebase the PR against the target branch and address valid comments. -4. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604). -5. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions. +1. GitHub sometimes doesn't notify people who commented / reviewed a PR previously, when you (force) push commits. If you have addressed the reviews you can [officially ask for a review](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from those who commented to you or anyone else. +2. If it is unfinished but you plan to finish it, please mark it as a draft. +3. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work. +4. To get things rolling again, rebase the PR against the target branch and address valid comments. +5. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604). +6. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions. ## Suggestions for issues diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index d61882c50400..be7a4ba02b61 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -2,6 +2,8 @@ name: "Checking EditorConfig" on: pull_request: + branches-ignore: + - 'release-**' jobs: tests: @@ -23,5 +25,5 @@ jobs: - name: Checking EditorConfig if: env.GIT_DIFF run: | - ./bin/editorconfig-checker -disable-indentation \ + ./bin/editorconfig-checker -disable-indent-size \ ${{ env.GIT_DIFF }} diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml new file mode 100644 index 000000000000..1aadef16328a --- /dev/null +++ b/.github/workflows/merge-staging.yml @@ -0,0 +1,39 @@ +name: "merge staging(-next)" + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '0 */6 * * *' + +jobs: + sync-branch: + if: github.repository == 'NixOS/nixpkgs' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Merge master into staging-next + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: staging-next + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Merge staging-next into staging + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: staging-next + target_branch: staging + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + |