diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/CODEOWNERS | 21 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
| -rw-r--r-- | .github/labeler.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/editorconfig.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/periodic-merge-24h.yml | 4 |
5 files changed, 29 insertions, 16 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8fba792f5eb..3e527f9529e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,6 +6,13 @@ # # For documentation on this file, see https://help.github.com/articles/about-codeowners/ # Mentioned users will get code review requests. +# +# IMPORTANT NOTE: in order to actually get pinged, commit access is required. +# This also holds true for GitHub teams. Since almost none of our teams have write +# permissions, you need to list all members of the team with commit access individually. +# We still add the team to the list next to its members, this helps keeping things +# in sync. (Put non team members before the team to distinguish them.) +# See https://github.com/NixOS/nixpkgs/issues/124085 for more details # This file /.github/CODEOWNERS @edolstra @@ -210,11 +217,11 @@ /pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq -/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq -/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq -/nixos/tests/cri-o.nix @NixOS/podman @zowoq -/nixos/tests/podman.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis +/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis +/nixos/tests/podman @NixOS/podman @zowoq @adisbladis # Docker tools /pkgs/build-support/docker @roberth @utdemir @@ -230,6 +237,10 @@ /pkgs/development/go-modules @kalbasit @Mic92 @zowoq /pkgs/development/go-packages @kalbasit @Mic92 @zowoq +# GNOME +/pkgs/desktops/gnome @NixOS/GNOME @jtojnar @hedning +/pkgs/desktops/gnome/extensions @piegamesde @NixOS/GNOME @jtojnar @hedning + # Cinnamon /pkgs/desktops/cinnamon @mkg20001 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 35c70da769f..268b1594de7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,7 +28,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) +- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/.github/labeler.yml b/.github/labeler.yml index 780843a2a55..e23cd9598ff 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -143,6 +143,8 @@ - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - pkgs/misc/vim-plugins/**/* + - nixos/modules/programs/neovim.nix + - pkgs/applications/editors/neovim/**/* "6.topic: xfce": - nixos/doc/manual/configuration/xfce.xml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 4cd3a1dfa8e..445f0fcbaf8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -11,36 +11,32 @@ on: jobs: tests: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')" steps: - name: Get list of changed files from PR env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - echo 'PR_DIFF<<EOF' >> $GITHUB_ENV gh api \ repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ | jq '.[] | select(.status != "removed") | .filename' \ - >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + > "$HOME/changed_files" + - name: print list of changed files + run: | + cat "$HOME/changed_files" - uses: actions/checkout@v2 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - if: env.PR_DIFF - uses: cachix/install-nix-action@v16 - if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '<nixpkgs>' - if: env.PR_DIFF - name: Checking EditorConfig - if: env.PR_DIFF run: | - echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size + cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." - diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 9032b3d7d91..b8535fdf952 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -32,6 +32,10 @@ jobs: into: staging-next-21.05 - from: staging-next-21.05 into: staging-21.05 + - from: release-21.11 + into: staging-next-21.11 + - from: staging-next-21.11 + into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 |