From 280f31043c2d97ba15926e8da0d879793c3f96c8 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 23 Jul 2024 13:29:05 +0100 Subject: [PATCH] CONTRIBUTING.md: allow using PRs to target `staging-next` --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23a826d9a7b7..babbf48671e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -382,7 +382,7 @@ The staging workflow exists to batch Hydra builds of many packages together. It works by directing commits that cause [mass rebuilds][mass-rebuild] to a separate `staging` branch that isn't directly built by Hydra. Regularly, the `staging` branch is _manually_ merged into a `staging-next` branch to be built by Hydra using the [`nixpkgs:staging-next` jobset](https://hydra.nixos.org/jobset/nixpkgs/staging-next). -The `staging-next` branch should then only receive direct commits in order to fix Hydra builds. +The `staging-next` branch should then only receive changes that fix Hydra builds. Once it is verified that there are no major regressions, it is merged into `master` using [a pull request](https://github.com/NixOS/nixpkgs/pulls?q=head%3Astaging-next). This is done manually in order to ensure it's a good use of Hydra's computing resources. By keeping the `staging-next` branch separate from `staging`, this batching does not block developers from merging changes into `staging`.