From a7d130ab60ff14597c26c53fcac9086be107ca21 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 8 Dec 2025 16:14:55 -0800 Subject: [PATCH] CODEOWNERS: add @NixOS/steering as the fallback codeowner of every documentation file The situation of #217 with no merge happening because of incorrect paperwork -- even though it's just documenting a change that already happened -- is *ridiculous*. Let's fix that. --- .github/CODEOWNERS | 42 +++++++++++++++++++++--------------------- doc/org-repo.md | 3 +++ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a2b8d9b..309e284 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,35 +1,35 @@ # See doc/org-repo.md -/README.md @NixOS/org -/CONTRIBUTING.md @NixOS/org -/LICENSE @NixOS/org +/README.md @NixOS/steering @NixOS/org +/CONTRIBUTING.md @NixOS/steering @NixOS/org +/LICENSE @NixOS/steering @NixOS/org -/.gitignore @NixOS/org -/.github/CODEOWNERS @NixOS/org -/.github/workflows @NixOS/org -/scripts @NixOS/org -/npins @NixOS/org -/default.nix @NixOS/org -/shell.nix @NixOS/org -/rulesets @NixOS/org -/rulesets/nixpkgs @NixOS/nixpkgs-core +/.gitignore @NixOS/steering @NixOS/org +/.github/CODEOWNERS @NixOS/steering @NixOS/org +/.github/workflows @NixOS/steering @NixOS/org +/scripts @NixOS/steering @NixOS/org +/npins @NixOS/steering @NixOS/org +/default.nix @NixOS/steering @NixOS/org +/shell.nix @NixOS/steering @NixOS/org +/rulesets @NixOS/steering @NixOS/org +/rulesets/nixpkgs @NixOS/steering @NixOS/nixpkgs-core /doc/org-repo.md @NixOS/steering /doc/discourse.md @NixOS/steering @mweinelt @lassulus @jtojnar @ctheune @dpausp -/doc/github.md @NixOS/org +/doc/github.md @NixOS/steering @NixOS/org /doc/github-org-owners.md @NixOS/steering /doc/matrix.md @NixOS/steering /doc/moderation.md @NixOS/steering -/doc/nixos-releases.md @NixOS/nixpkgs-core +/doc/nixos-releases.md @NixOS/steering @NixOS/nixpkgs-core /doc/resources.md @NixOS/steering -/doc/mail.md @NixOS/infra -/doc/freescout.md @infinisil +/doc/mail.md @NixOS/steering @NixOS/infra +/doc/freescout.md @NixOS/steering @infinisil /doc/governance.md @NixOS/steering /doc/values.md @NixOS/steering -/doc/vault.md @Mic92 @mweinelt @zimbatm +/doc/vault.md @NixOS/steering @Mic92 @mweinelt @zimbatm /doc/constitution.md @NixOS/steering -/doc/nixpkgs-core.md @NixOS/nixpkgs-core -/doc/nixpkgs-committers.md @NixOS/nixpkgs-core -/doc/calendar.md @edolstra @tomberek @fricklerhandwerk +/doc/nixpkgs-core.md @NixOS/steering @NixOS/nixpkgs-core +/doc/nixpkgs-committers.md @NixOS/steering @NixOS/nixpkgs-core +/doc/calendar.md @NixOS/steering @edolstra @tomberek @fricklerhandwerk /doc/nixcon.md @NixOS/steering -/doc/hetzner.md @NixOS/infra +/doc/hetzner.md @NixOS/steering @NixOS/infra diff --git a/doc/org-repo.md b/doc/org-repo.md index d213cb8..321e02d 100644 --- a/doc/org-repo.md +++ b/doc/org-repo.md @@ -8,3 +8,6 @@ PRs can only be merged if a codeowner for the respective files approves it, and Furthermore, the code owners for the CODEOWNERS file should have permission to give more people write access to this repository. These people get requested for reviews when new people add themselves to CODEOWNERS, allowing them to give write access when merged. + +Every member of the steering committee has the right to merge a PR in the repository. +The person who merges is responsible for doing so with due care.