Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No more mass pings due to the wrong base branch [skip treewide] #347626

Closed
wants to merge 2 commits into from

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Oct 10, 2024

This is an intentional final mass ping to make a PSA to everybody who's been plagued by unnecessary mass pings for all these years, because it won't happen any longer!

This is because since recently, we're not using the GitHub-native CODEOWNERS file, but rather the custom ci/OWNERS and a smart GitHub Action workflow to check it and request reviews based on it, with the major benefits of:

  • When the wrong base branch is chosen, no mass ping is triggered, instead a helpful message (and only if the user doesn't immediately fix it)
  • Code owners don't need to have write access

Please spread the news that we can freely set and change the base branch now without worrying about filling up notification inboxes, and encourage more people to add themselves as code owners 🚀

And if you spot any issues, let me know, I'll be tending to it


Original description:

Add support for Windows by changing all files to use CRLF as the file ending. Who knew it would be this simple!


This was sponsored by Antithesis and Tweag! ✨

@nix-owners
Copy link

nix-owners bot commented Oct 10, 2024

The PR's base branch is set to master, but 1108 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch:
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/staging HEAD)
    git rebase --onto 9ee9cac8884ba11650ef6946a1bed9c7171f560a e694240f776e555ab4b0e3bab12dca20da7a9546
    git push --force-with-lease

1 similar comment
@nix-owners

This comment was marked as duplicate.

@Frontear
Copy link
Member

LGTM

@Frontear
Copy link
Member

On a serious note, awesome to see it worked!

@emilazy emilazy marked this pull request as draft October 10, 2024 00:53
@emilazy
Copy link
Member

emilazy commented Oct 10, 2024

Please fix the nixpkgs-vet error. Otherwise LGTM.

@AndersonTorres
Copy link
Member

LGTM (looks gore to me)

@infinisil infinisil changed the base branch from master to staging October 12, 2024 02:04
@infinisil infinisil changed the title Windows support [skip treewide] The last mass ping [skip treewide] Oct 12, 2024
@infinisil infinisil changed the title The last mass ping [skip treewide] The last mass ping due to the wrong base branch [skip treewide] Oct 12, 2024
@infinisil infinisil marked this pull request as ready for review October 12, 2024 03:04
@infinisil infinisil marked this pull request as draft October 12, 2024 03:33
@infinisil infinisil changed the title The last mass ping due to the wrong base branch [skip treewide] No more mass pings due to the wrong base branch [skip treewide] Oct 12, 2024
diff --git a/.editorconfig b/.editorconfig
index 1d2259154e48..60f8659fdf79 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,7 @@ root = true

 # Unix-style newlines with a newline ending every file, utf-8 charset
 [*]
-end_of_line = lf
+end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
@infinisil infinisil marked this pull request as ready for review October 12, 2024 04:14
@nix-owners
Copy link

nix-owners bot commented Oct 12, 2024

The PR's base branch is set to staging, but 15 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch:
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
    git rebase --onto b418f9bd8a04782f6614be88ce931bc3c2bf97c8 bb752745b2f44ebe6a70d5494af3101c739b3811
    git push --force-with-lease

@infinisil infinisil changed the base branch from staging to master October 12, 2024 04:17
@infinisil
Copy link
Member Author

Turns out it's not possible to request more than 15 people with normal means, so it's very much impossible to mass ping people now! This isn't great though, it's fair to mass ping if the relevant files are changed legitimately, so I'll look into how this can be addressed. To avoid further notifications, let's close and lock this now though

@infinisil infinisil closed this Oct 12, 2024
@infinisil infinisil deleted the codeowners-test branch October 12, 2024 04:34
@NixOS NixOS locked as resolved and limited conversation to collaborators Oct 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants