Skip to content

Conversation

@GaetanLepage
Copy link
Contributor

Things done

cc @vinnymeller

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 25, 2025
@emilazy
Copy link
Member

emilazy commented Jul 25, 2025

@wolfgangwalther I fear we are going to break the branch many times over the next few weeks from stale CI results. Do you know how difficult it would be to get a merge queue going just for formatting/parse checks at first? 🙏

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 25, 2025
@adisbladis adisbladis merged commit 4ef8a8e into NixOS:master Jul 25, 2025
26 of 30 checks passed
@GaetanLepage GaetanLepage deleted the git-spice branch July 25, 2025 14:37
@jfly jfly mentioned this pull request Jul 25, 2025
13 tasks
@jfly
Copy link
Contributor

jfly commented Jul 25, 2025

@wolfgangwalther I fear we are going to break the branch many times over the next few weeks from stale CI results

Is there a central place where this issue is being discussed?

@emilazy
Copy link
Member

emilazy commented Jul 25, 2025

Not really. This PR came up on Matrix. The issue is that successful formatting checks still allow merges into the branch even after the formatting check has switched to use the new version, so you can merge “green” PRs that break the branch. A merge queue would fix that.

@emilazy
Copy link
Member

emilazy commented Jul 25, 2025

re:

Unless there's some way to "expire" all these known stale checks?

I suppose we could change the name of the required job again, at the expense of annoying people a bunch. Changes that touch existing code in a way that could cause issues will become conflicted, so it’s only new code that is particularly problematic.

@jfly
Copy link
Contributor

jfly commented Jul 25, 2025

I suppose we could change the name of the required job again, at the expense of annoying people a bunch.

Neat trick! Wouldn't a merge queue also annoy a bunch of people in this scenario? That is, the annoying thing we did is changing the formatter. Merge queue/living with stale checks/proactively "expiring" stale checks are all just various ways of shifting that pain around.

@emilazy
Copy link
Member

emilazy commented Jul 25, 2025

The difference is that a merge queue will only reject PRs that are actually problematic; changing the required checks will reject everything. (Which also means that breaking the branch is more likely, because people will feel compelled to override it more.)

@wolfgangwalther
Copy link
Contributor

I fear we are going to break the branch many times over the next few weeks from stale CI results. Do you know how difficult it would be to get a merge queue going just for formatting/parse checks at first? 🙏

Here we go: #431146

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any 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.

6 participants