Commit Graph

85 Commits

Author SHA1 Message Date
Philip Taron
d6d9c6125a
Improve PR merge check for CI (#347786) 2024-10-12 09:11:24 -07:00
github-actions[bot]
d363932842
Merge staging-next into staging 2024-10-12 06:04:59 +00:00
Silvan Mosberger
e612b89953 ci/request-reviews: Avoid duplicates with different casings
It's possible to have different casings in OWNERS, so we need to handle
that
2024-10-12 05:27:55 +02:00
Lin Jian
d4c28e77c3
OWNERS: reference the Emacs team for Emacs stuff (#347973) 2024-10-12 10:02:57 +08:00
Silvan Mosberger
e6a8855a14 ci/get-merge-commit.sh: Add documentation
And distinguish exit codes
2024-10-12 03:59:02 +02:00
Silvan Mosberger
048f4aa537 ci/get-merge-commit.sh: Exit for non-open PRs
If PRs aren't open (either merged or closed), GitHub never computes
whether the PR is mergeable, so we'd wait forever, which has been
happening:
https://github.com/NixOS/nixpkgs/actions/runs/11279197077/job/31369348101#step:2:59
2024-10-12 03:59:02 +02:00
Silvan Mosberger
7f9d297838 workflows/nixpkgs-vet: Make merge check script reusable
This is useful for other workflows as well. Originally I thought it
couldn't be put in the repo, but it can (just needs another checkout)
2024-10-12 03:58:39 +02:00
github-actions[bot]
9f6509c682
Merge staging-next into staging 2024-10-12 00:14:07 +00:00
Lin Jian
f4c6e1174c
ci/request-reviews: fix headRef to point to the PR head
Previously, headRef points to the master branch of Nixpkgs, which
basically means no code owner review will be requested.

The problem can be verified using the following command.

$ DRY_MODE=1 ./ci/request-reviews/request-reviews.sh NixOS/nixpkgs 347973 ci/OWNERS
[...]
This PR touches 0 files
Requesting reviews from: {
  "reviewers": []
}
[...]

Additionally, the comment about conflicts is removed thanks to the
unambiguous way of specifying ref.
2024-10-12 06:10:17 +08:00
Philip Taron
e857941615
Fix codeowner workflow for branches starting with "pr" (#347831) 2024-10-11 13:50:42 -07:00
Lin Jian
961d9c049c
OWNERS: make the Emacs team own Emacs docs 2024-10-12 03:51:44 +08:00
Lin Jian
89f3f5c7e0
OWNERS: reference the Emacs team for Emacs stuff 2024-10-12 03:12:28 +08:00
Tristan Ross
b8b6738386
OWNERS: make the LLVM team own all of LLVM 2024-10-11 10:46:26 -07:00
github-actions[bot]
a45a33309f
Merge staging-next into staging 2024-10-11 06:05:14 +00:00
Silvan Mosberger
bac526a0fe
OWNERS: reference the ACME team directly (#347832) 2024-10-11 03:55:31 +02:00
Emily
ffc65adb0a OWNERS: reference the ACME team directly
We can finally stop leaving @m1cr0man out thanks to
<https://github.com/NixOS/nixpkgs/pull/347610> 🎉
2024-10-11 02:45:18 +01:00
Silvan Mosberger
299a181477 ci/request-reviews: Fix for branches starting with "pr"
Turns out if :<something> is passed, a local branch is updated, which
can conflict if the PR branch starts with "pr". I tried to avoid that
with the original code but apparently that didn't work!

https://github.com/NixOS/nixpkgs/actions/runs/11284183639/job/31384967152?pr=347822

    Fetching the PR commit history
    From https://github.com/linj-fork/nixpkgs
     * [new branch]            pr/kanata-add-version-check -> fork/pr
    error: cannot lock ref 'refs/remotes/fork/pr/kanata-add-version-check': 'refs/remotes/fork/pr' exists; cannot create 'refs/remotes/fork/pr/kanata-add-version-check'
     ! [new branch]            pr/kanata-add-version-check -> fork/pr/kanata-add-version-check  (unable to update local ref)
    error: some local refs could not be updated; try running
2024-10-11 03:40:57 +02:00
github-actions[bot]
144082b47e
Merge staging-next into staging 2024-10-10 18:05:19 +00:00
Adrian Pistol
d2255aecf2 chrony: move to by-name 2024-10-10 10:34:51 +02:00
Emily
e694240f77 Merge staging-next into staging 2024-10-10 01:23:52 +01:00
Emily
27272c21af
Mass pings be gone, code owners for all (#347610) 2024-10-10 00:52:01 +01:00
Silvan Mosberger
c721e917ce ci/request-reviews: Make wrong base branch message hashes more transparent
Also, fix the description of the text
2024-10-10 01:40:11 +02:00
Silvan Mosberger
b01ca00aed CODEOWNERS: Switch to alternate mechanism
This effectively disables the native GitHub codeowners feature
and enables the new alternate codeowners mechanism introduced in
https://github.com/NixOS/nixpkgs/pull/336261

This means that:
- We can now declare users without write access as code owners!
- Targeting the wrong branch won't trigger mass pings anymore!
2024-10-10 01:40:05 +02:00
Silvan Mosberger
1ff83b2c96 ci/request-reviews: Request reviews for individual team members
This makes this codeowner mechanism behave differently than the native
one, but there's no other way to avoid rerequesting reviews from teams
when a member already reviewed the PR.
2024-10-09 23:49:14 +02:00
Silvan Mosberger
9a054bb9dd ci/request-reviews: Don't rerequest users that already reviewed
The automation should never rerequest reviews from users that already
reviewed the changes, which is what was happening before this change:

https://github.com/NixOS/nixpkgs/pull/347354#event-14570645380

Also reorder the arguments to make more sense
2024-10-09 23:49:01 +02:00
Silvan Mosberger
5695bf6cfe ci: Add codeowners validator 2024-10-08 22:14:59 +02:00
Silvan Mosberger
369cfa02da ci: Add review request scripts
Also post a comment in case base branch is wrong
  This guides newcomers in how to smoothly handle the potentially scary
  situation of having thousands of commits listed in a PR.

  While CI shows the same, people might not even look at CI if the PR
  looks botched.
2024-10-08 22:14:01 +02:00
Silvan Mosberger
1700d00588 ci: Add default.nix with exposed pkgs
Allows reusing it in more places
2024-10-08 22:13:59 +02:00
Silvan Mosberger
aec0d14834 treewide: Fix or remove some markdown links
Found using https://github.com/serokell/xrefcheck, which unfortunately
can't trivially be enforced in CI because we also have the manual markdown
files that need post-processing to be valid
2024-09-03 23:37:05 +02:00
Philip Taron
89cbfde96d
nixpkgs-vet: update CI, docs, and release to 0.1.4
Everything gets moved into the `ci/` top-level directory.

We keep behind `maintainers/scripts/check-by-name.sh` and `pkgs/test/check-by-name/pinned-version.txt` as they are going to cause CI errors and confusion until we get all the way through the various channels.
They'll be removed in about a week or so.
2024-09-03 13:53:25 -07:00
Silvan Mosberger
7aa5bc8043 ci: Update pinned Nixpkgs
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1808410#tabs-inputs
2024-08-22 16:42:30 +02:00
Silvan Mosberger
8e1b9b9eb3 ci/pinned-nixpkgs.json: update
Update it to https://hydra.nixos.org/eval/1807730#tabs-inputs, which
notably contains some fixes for nixfmt: https://github.com/NixOS/nixfmt/pull/215
2024-07-18 15:52:11 +02:00
Silvan Mosberger
545eb50c7d ci/update-pinned-nixpkgs.sh: Allow setting the rev
This script only needs to make sure that the revision has the relevant
packages built, it doesn't necessarily need to be a channel version.
This commit makes it possible to set the revision explicitly when
calling the update script.
2024-07-18 15:51:02 +02:00
Silvan Mosberger
b33ac05d04 ci: reusable Nix format Nixpkgs pin
This is needed such that in the next commit, we can re-use the same
version from a shell.nix, allowing people to have a guaranteed matching
nixfmt version.
2024-06-26 16:06:49 +02:00
Silvan Mosberger
13599930cb ci: init directory
This creates a new directory for all CI support files, will be populated
in future commits.
2024-06-26 16:04:43 +02:00