Skip to content

top-level/release-outpaths: move to ci/eval & refactor#439221

Merged
wolfgangwalther merged 7 commits intoNixOS:masterfrom
wolfgangwalther:ci-release
Sep 3, 2025
Merged

top-level/release-outpaths: move to ci/eval & refactor#439221
wolfgangwalther merged 7 commits intoNixOS:masterfrom
wolfgangwalther:ci-release

Conversation

@wolfgangwalther
Copy link
Contributor

These files are tightly coupled with the code in ci/eval and not used anywhere else. They are subject to the same backporting requirements as the remaining CI code. They are better placed next here.

Followed up by some refactoring and cleanup while I was trying to understand the code in these files to the dot.

Best reviewed commit-by-commit.

Things done


Add a 👍 reaction to pull requests you find important.

These files are tightly coupled with the code in ci/eval and not used
anywhere else. They are subject to the same backporting requirements as
the remaining CI code. They are better placed next here.
By now, these files have been changed enough to not need the "vendored
from" notes anymore. These links would still be there when going through
the history of the file, but today GHA CI has not many similarities
anymore to what ofborg did, so these are not really helpful.
This condition doesn't make a difference anymore, ever since we removed
the tryEval code from this file and had already enabled unfree packages
earlier anyway.
The following changes were made:
- Using `lib.` instead of `builtins.`
- Using `mapAttrsToList` instead of `mapAttrs` + `attrValues`
- Joining two of the if conditions with the same return value
- Using `traceIf` instead of `if` / `else`
- Using `showAttrPath` instead of `concatStringsSep`
This should always be set anyways.
This attribute was supposed to be set on derivations, to make the
release tools recurse into them. The remaining uses were all on regular
attrsets, though, so this is safe to remove.
`pkgsArocc` and `pkgsZig` had been added to `release.nix`, so should be
listed here as well.
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions backport release-25.05 labels Sep 1, 2025
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Sep 1, 2025
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 1, 2025
@wolfgangwalther wolfgangwalther removed the ofborg-internal-error Ofborg encountered an error label Sep 3, 2025
@philiptaron
Copy link
Contributor

Anything else needed before this is merged?

@wolfgangwalther
Copy link
Contributor Author

No, not really. Since there is nothing blocked on it, so far, I thought I'd keep it open a bit more just in case somebody wanted to chime in on anything. As soon as #439255 (comment) is figured out, I'd merge this, though, to get the other PR going.

@philiptaron
Copy link
Contributor

I'd like to merge it then because I want to base things on it too 😁

@wolfgangwalther
Copy link
Contributor Author

Oh, of course, that's fine.

@wolfgangwalther wolfgangwalther merged commit 5c46086 into NixOS:master Sep 3, 2025
32 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-release branch September 3, 2025 16:27
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Sep 3, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Sep 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants