Hi!

Andreas Enge <andr...@enge.fr> writes:

> Apparently they do not work with feature or team branches, as we had
> decided to do during Guix Days 2024, but instead all commits go to a
> separate staging branch, which is continually built. If this works out
> well, then the branch is pushed to master. If not, the commits are dropped,
> and the people who submitted them need to get back to square zero and
> submit repaired patches for the next round.

How are these commits dropped, concretely?  Do they get reverted by the
person in charge of this staging branch?

What about per-pull-request builds?  My understanding is that those
submitted by the @r-ryantm package upgrade bot¹ are built before being
submitted:

  https://github.com/NixOS/nixpkgs/pull/425322

… but those submitted manually have a number of tests ran automatically
but it’s not clear to me whether that includes actual builds:

  https://github.com/NixOS/nixpkgs/pull/425319

I suppose PRs reach the staging branch after these tests have succeeded,
right?

¹ https://nix-community.github.io/nixpkgs-update/r-ryantm/#r-ryantm

[...]

> I got the impression that more concerted effort is deployed for big
> changes (like the new version of gcc we have in core-packages-team,
> or similar ones), but I do not know how this goes together with the
> general staging branch approach.

In practice, I suspect updates “that go together” would still be
submitted as one pull request, and thus tested independently of the rest
at that point.  (Akin to creating a branch and getting QA/CI to build
it, except that this happens automatically.)

Sorry for bringing more questions. :-) 

Thanks,
Ludo’.

Reply via email to