Commit Graph

907 Commits

Author SHA1 Message Date
Wolfgang Walther
ea636d1728 ci/check-cherry-picks: allow cherry-picking from haskell-updates and python-updates
Those are protected branches, which can't be force pushed to - so the
commits will remain. Thus, we can also backport from them.
2025-05-28 15:31:28 +02:00
Wolfgang Walther
e575364ae6 workflows/check-cherry-picks: reduce checkout time
Using a `tree:0` filter instead of `blob:none` reduces the checkout time
from over 3 minutes to about 45 seconds. The required trees/blobs will
then be fetched on-demand.

This on-demand fetching creates additional output for `git range-diff`
on stderr, so we hide that. This only happens the first time it's run,
so we don't need to adjust the other calls - which will still return any
real errors, should they happen.
2025-05-28 14:56:55 +02:00
Wolfgang Walther
245b1c1c48 ci/check-cherry-picks: never use a pager
In a small terminal window this would just stop running after each
commit until you exit the pager. That's not what we want when running it
locally.
2025-05-28 14:56:55 +02:00
Wolfgang Walther
2fea2bbf52 ci/check-cherry-picks: support different remotes than "origin"
The default is to checkout a contributors fork as "origin", thus the
NixOS/nixpkgs remote is most likely named differently. But not everybody
keeps their fork's main branches up-to-date all the time. Thus the
script would fail locally.
2025-05-28 13:26:42 +02:00
Wolfgang Walther
6cf5f9e83b ci/check-cherry-picks: run shellcheck 2025-05-28 12:52:40 +02:00
Wolfgang Walther
e2a3792169 ci/check-cherry-picks: improve error handling
We recently moved the $commits variable out of a "subshell in a
herestring", let's do the same for the list of branches, where errors
would be silently swallowed as well.

Also reformat the expressions slightly, we have enough line-length.
2025-05-28 12:52:39 +02:00
Wolfgang Walther
ad4b36d2d2 ci/check-cherry-picks: move from maintainers/scripts
The script is part of CI and changes to it should be reviewed by the CI
owners. Thus moving it to ci/ is the most sensible thing to do.
2025-05-28 12:52:36 +02:00
Wolfgang Walther
8a39ce4a48 workflows/eval: diff outpaths immediately
This moves the diff of outpaths into the outpaths job, mainly as a
preparation to allow future improvements. For example, this will allow
running the purity release checks only on changed outpaths instead of
the whole eval.

This also removes the inefficiency introduced in the last commit about
uploading the intermediate paths twice. Now, only the diff is passed on.

Also, technically, the diff is now run in parallel across 4 jobs. This
should be *slightly* faster than before, where outpaths from all systems
were combined first and then diffed. It's probably only a few seconds,
though.
2025-05-25 19:26:08 +02:00
Wolfgang Walther
b2579d36ff workflows/eval: consistently avoid "result" in arguments
Everything is a result, especially when nix-build uses "result" as its
default output. This becomes confusing, when re-wiring the different
parts later.

Thus, consistently name those things after some of their properties and
avoid the term result.
2025-05-25 19:23:12 +02:00
Wolfgang Walther
942c377476 workflows/nixpkgs-vet: use nixpkgs-vet from pinned nixpkgs
We have added nixpkgs-vet as a regular package to nixpkgs a while ago,
so we can now use it from pinned nixpkgs. This avoids pulling a
platform-specific binary version from upstream.

This change also allows to run the tool easily locally, the same way as
other tools:

  nix-build ci -A nixpkgs-vet

This will do a full check of the repo with the exception of
nixpkgs-vet's "ratchet" checks: Those depend on having two branches to
compare, but the default is to only look at the head branch. Those
ratchet checks will still be run in CI, though.
2025-05-25 15:01:42 +02:00
Aleksana
1783268cc4 OWNERS: add myself to lib/licenses.nix (#410456) 2025-05-24 19:13:29 +08:00
Emily
1015c45b0e OWNERS: add more standard environment–related libraries
I think it makes sense for the `stdenv` team to handle review of
changes to these libraries that have substantial effects on the
things in their scope, like the semantics of `stdenv.mkDerivation`,
override interfaces, `meta` handling, and so on. This is already how
`lib/systems/` is handled, and it makes sense to me to extend it.

This would hopefully have helped avoid situations
like <https://github.com/NixOS/nixpkgs/pull/403678> and
<https://github.com/NixOS/nixpkgs/pull/410179>, where the `stdenv`
team was unaware of the original change for weeks.
2025-05-24 12:00:24 +01:00
Wolfgang Walther
138393e0ba ci/eval.combine: avoid parsing of plain text file into JSON
Instead of parsing a plain text file with jq, we can make nix-env output
JSON directly, which is significantly faster.

This saves about 8 out of 10 seconds for the combine step.
2025-05-24 12:36:15 +02:00
Wolfgang Walther
d87d760dfa ci/eval.compare: use lib from pinned nixpkgs
compare/maintainers.nix needs to access the current checkout to check
attrpaths, but makes the mistake of using lib from that checkout as
well. All other code in ci/ uses the pinned nixpkgs instance, so
maintainers.nix should do so as well.
2025-05-24 12:36:15 +02:00
Wolfgang Walther
eccd9564ab ci/eval: improve api when calling in steps
Previously, `eval.full` organized the results for the supported systems
in a specific layout, i.e. with a folder with one subfolder per system.
Then, `eval.combine` relied on that.

When using `eval.singleSystem` and `eval.combine` directly, the caller
was responsible to recreate the same layout. This is annoying and
error-prone to do, when downloading artifacts from CI to recreate some
steps locally.

With this change, all the artifacts can be downloaded and extracted into
the same folder - because the result from `eval.singleSystem` already
contains the <system-name>/ subfolder.
2025-05-24 12:36:14 +02:00
Jörg Thalheim
b29abce2e6 workflows/get-merge-commit: support merge conflicts, run as step in main jobs (#410430) 2025-05-24 12:25:02 +02:00
Emily
856cb3108a OWNERS: add myself to lib/licenses.nix
As one of the resident Nixpkgs licensing pedants and reviewer of
several recent changes to this file I think it makes sense to make
the de facto the de jure.
2025-05-24 10:22:00 +01:00
Wolfgang Walther
e48d9d6174 workflows/get-merge-commit: move to composite action
We don't need a separate workflow anymore, because we don't need to skip
dependent jobs on failures anymore. The biggest failure mode was
"conflict" previously, but we resolved that on the last commit. The
remaining failure modes are so rare, that it's OK to just fail the jobs
in this case instead of marking them as "skipped". Especially, because
the resolve-merge-commit job would have previously failed anyway.

By moving this to an action we avoid running separate jobs each time we
need the merge commit. This also makes the check list in PRs much
cleaner.
2025-05-23 23:06:20 +02:00
Wolfgang Walther
277f7b998c workflows/get-merge-commit: inline get-merge-commit.sh script as github-script
The reason this was a separate shell script was, that this would be
included in multiple workflows separately. But a while ago this had been
changed to a re-usable workflow, so we can just as well inline the
script.

This also allows us to use actions/github-script, which makes for a much
more readable script than the bash script before.
2025-05-23 23:05:26 +02:00
Philip Taron
d2860c9744 limine, nixos/limine, nixosTests.limine: inherit pkgs.limine maintainers, add johnrtitor (#410094) 2025-05-23 08:26:15 -07:00
John Titor
57b05ff83f ci/OWNERS: add johnrtitor to limine module and tests owners
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
2025-05-23 15:06:51 +05:30
Winter
5240bdf3c6 ci/eval: don't evaluate packages marked as broken
We really can't expect packages that are marked as broken to evaluate,
and *especially* not on unsupported platforms.

For context, we were attempting to eval them *past* the broken throw
previously, which caused fun side effects like [0].

When we set `includeBroken = true` before, this also included unfree
packages. Those would now be excluded, which is not what we want. Thus,
we explicitly enable them separately.

Commit by winterqt, message slightly reworded by wolfgangwalther.

[0]:
https://github.com/NixOS/nixpkgs/issues/355847#issuecomment-2878873137
2025-05-22 21:38:02 +02:00
Wolfgang Walther
66cc5bf25e ci/eval: remove left-over stats.json (#408411) 2025-05-22 19:07:49 +00:00
JuliusFreudenberger
a01b51d00b teleport: move to by-name
Make teleport built by the by-name structure in package.nix.
The versioned attributes are defined in their own package.nix
in by-name using overrides.
Also change reference in ci/OWNERS
2025-05-18 19:54:48 -04:00
Wolfgang Walther
edaf51cb83 ci/eval: remove left-over stats.json
This seems to be a left-over from before the performance comparison was
changed to a difference-per-chunk analysis.
2025-05-18 16:50:20 +02:00
Wolfgang Walther
17fbc7b5f9 ci/eval/nix: 2.24 -> latest (#404589) 2025-05-17 20:53:57 +00:00
Wolfgang Walther
62cac4f0c4 ci/eval/compare: manage the "by: package-maintainer" label (#407465) 2025-05-17 20:48:58 +00:00
Robert Hensing
529143f3d7 ci/nix: 2.24 -> 2.28 2025-05-17 21:51:19 +02:00
Winter
d52066e2b1 ci/eval/compare: manage the "by: package-maintainer" label
While OfBorg is still adding these, it takes a much longer time to do so
compared to the eval action. Since we're adding rebuild labels, I think
it'd be nice to just do it within the eval action.
2025-05-17 15:45:13 -04:00
Wolfgang Walther
fa939cd6a0 ci/eval: allow configuration of the system to eval attrpaths on (#408047) 2025-05-17 17:49:26 +00:00
Tristan Ross
f8e91921e7 docs: add toolchains and llvm (#398741) 2025-05-17 06:08:35 -07:00
Winter
6b18b3d67b ci/eval: allow configuration of the system to eval attrpaths on
Right now, there are some paths that don't even get exposed to certain
systems (notably Darwin, but some outliers exist for Linux such as the
Darwin-specific Hackage overlay) for one reason or another, usually
because of assertions like `stdenv.isLinux`. To catch these scenarios,
this change implements a way to specify the system to evaluate attrpaths
on, and makes it default to the system that we're evaluating outpaths
for.
2025-05-16 17:14:03 -04:00
Tristan Ross
6cf59ae5a2 ci/OWNERS: make llvm own llvm toolchain chapter 2025-05-13 21:21:41 -07:00
Winter
4d113f8044 ci: Update pinned Nixpkgs
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1815229#tabs-inputs
2025-05-13 21:12:32 -04:00
Wolfgang Walther
1893f5439e workflows/check-format: run on all files
This was run on .nix files only, but we recently added keep-sorted,
editorconfig-checker and actionlint to treefmt, so CI needs to check all
files instead.
2025-05-13 08:24:25 +02:00
SomeoneSerge
918bbc36dd OWNERS: add cuda-maintainers 2025-05-12 23:03:03 +00:00
Winter
940c27de00 OWNERS: remove ehmry
User was banned [0], so do this to stop the CI from failing.

[0]: 0629826825
2025-05-12 17:47:07 -04:00
Wolfgang Walther
af6faf8760 workflows/eval: remove attrs step
Previously, the attrs step consisted of:
- 7s queue time
- 1m 15s run time

Only 25s of this were spent preparing the attr paths. A bit more than a
minute was just spent for queuing, checking out the repo, downloading
nix, downloading dependencies, uploading the artifacts - and then
downloading them again in the next step. All of that can be avoided if
we collect the attrs as part of the outpaths job.

By running the attrs step as part of each outpaths step the attrpaths
will be collected 4x, but:
- We save a minute for each eval run to complete.
- We save a full job, giving us more free runners and *possibly* less
queue times for other jobs in the repo.
- We reduce complexity in the workflow file.
2025-05-11 22:22:48 +02:00
Wolfgang Walther
962836d4d0 workflows/get-merge-commit: return targetSha
We can fetch the targetSha directly with the mergedSha from the API.
This avoids a checkout with fetch-depth: 2 for a small performance
improvement.
2025-05-11 22:22:47 +02:00
Wolfgang Walther
456a4697b1 workflows/eval: load supportedSystems from JSON file
This is a refactor to prepare the next commit. It doesn't do much on its
own, but is separated for ease of review.
2025-05-11 22:22:45 +02:00
Jörg Thalheim
53a79ee500 workflows/check-format: add actionlint (#406114) 2025-05-11 12:55:51 +02:00
Jörg Thalheim
7fd771ee97 ci: allow running jobs locally (#404466) 2025-05-11 12:28:04 +02:00
Wolfgang Walther
101a271eed ci/parse: test for nix 2.3 and lix
This adds the minimum nix version and the latest lix version to the
matrix of parse checks. Especially the minimum nix version is relevant,
because parsing routinely breaks because of introduction of newer
syntax.

Adding lix just completes the picture.
2025-05-11 12:14:59 +02:00
Wolfgang Walther
a553ef2950 ci/parse: init
The nix-parse workflow can now be run locally the same way as in CI.

To do this, the CI's workflow was slightly adjusted. Instead of testing
only the changed files, we're now testing all files in the repository.

This is possible in two ways:

1. By calling nix-instantiate once with all files as arguments. This
will be rather fast, but only the first error is shown before it errors
out.
2. By calling nix-instantiate once for each file. This will be much
slower, but has the advantage that we see all errors at once.

To avoid running the long variant every time, we first do a quick check
with the fast version. If that fails, we run the slower one to report
the errors. This gives us the best of both.
2025-05-11 12:14:57 +02:00
Wolfgang Walther
8b65ba5b8e workflows/check-format: add actionlint
I added a lint-action.sh script in .github/workflows a while ago while
fixing some warnings. But I haven't run it myself ever since. This needs
to be part of CI to make any use of it.
2025-05-11 11:06:06 +02:00
Wolfgang Walther
1cf2d6085b OWNERS: add postgresqlTestHook to NixOS/postgres team 2025-05-11 10:44:19 +02:00
John Titor
2a573ad886 ci/OWNERS: add warp-terminal maintainers as they were not getting pings previously
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
2025-05-11 09:04:45 +05:30
Wolfgang Walther
7c16d15d7f ci/shell: init
The dev shell can now be built locally the same way as in CI with:

  nix-build ci -A shell
2025-05-10 22:14:16 +02:00
Wolfgang Walther
d253ad12b2 ci/manual-nixpkgs: init
The Nixpkgs manual can now be built locally the same way as in CI with:

  nix-build ci -A manual-nixpkgs -A manual-nixpkgs-tests
2025-05-10 22:14:15 +02:00
Wolfgang Walther
89520b962a ci/manual-nixos: init
The NixOS manual can now be built locally the same way as in CI with:

  nix-build ci -A manual-nixos
2025-05-10 22:13:58 +02:00