Skip to content

[24.11] OWNERS: simplify workflow/ci owners#416417

Merged
wolfgangwalther merged 1 commit intoNixOS:release-24.11from
wolfgangwalther:ci-backport-workflow-ci-owners-24.11
Jun 13, 2025
Merged

[24.11] OWNERS: simplify workflow/ci owners#416417
wolfgangwalther merged 1 commit intoNixOS:release-24.11from
wolfgangwalther:ci-backport-workflow-ci-owners-24.11

Conversation

@wolfgangwalther
Copy link
Copy Markdown
Contributor

Manual backport of #412688.

The current setup causes the Security team and the other owners of
.github/workflows to **not** be pinged for the
check-format/codeowners-v2/nixpkgs-vet workflows. This was highly likely
unintended when adding those additional rules, so removing them.

Also, we have some owners looking after `workflows/`, but not `ci/` -
and some the other way around. This doesn't make much sense to me, since
both parts depend on each other very much.

(cherry picked from commit b98e7bb)
@github-actions github-actions Bot added 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 4.workflow: backport This targets a stable branch labels Jun 13, 2025
@nix-owners nix-owners Bot requested review from infinisil and philiptaron June 13, 2025 10:38
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the check-cherry-picks CI workflow.

Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.

Please make sure to follow the backporting guidelines and cherry-pick with the -x flag. This requires changes to go to the unstable branches (master / staging) first, before backporting them.

Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. If you need to merge this PR despite the warnings, please dismiss this review.

Warning

Difference between af4ff13 and original b98e7bb may warrant inspection.

Show diff
@@ Commit message
     and some the other way around. This doesn't make much sense to me, since
     both parts depend on each other very much.
 
+    (cherry picked from commit b98e7bb95a1e66d951a9c517cadb151694358bad)
+
  ## ci/OWNERS ##
 @@
+ # Processing of this file is implemented in workflows/codeowners-v2.yml
  
  # CI
- /.github/*_TEMPLATE*                    @SigmaSquadron
--/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
--/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
--/.github/workflows/check-format.yml     @infinisil @wolfgangwalther
--/.github/workflows/codeowners-v2.yml    @infinisil @wolfgangwalther
--/.github/workflows/nixpkgs-vet.yml      @infinisil @philiptaron @wolfgangwalther
--/ci                                     @infinisil @philiptaron @NixOS/Security @wolfgangwalther
+-/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil
+-/.github/workflows/check-format.yml @infinisil
+-/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
+-/.github/workflows/codeowners-v2.yml @infinisil
+-/ci @infinisil @philiptaron @NixOS/Security
+-/ci/OWNERS @infinisil @philiptaron
 +/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
 +/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
 +/ci                                     @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
- /ci/OWNERS                              @infinisil @philiptaron
++/ci/OWNERS                              @infinisil @philiptaron
  
  # Development support
+ /.editorconfig @Mic92 @zowoq

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@github-actions github-actions Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 13, 2025
@wolfgangwalther wolfgangwalther dismissed github-actions[bot]’s stale review June 13, 2025 10:42

I resolved the conflict by replacing the ci OWNERS on 24.11 with those on master. They had not been updated on 24.11.

@wolfgangwalther wolfgangwalther merged commit 9495a89 into NixOS:release-24.11 Jun 13, 2025
15 of 18 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-backport-workflow-ci-owners-24.11 branch June 13, 2025 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant