Skip to content

Don't immediately remove new committers#31

Merged
infinisil merged 1 commit intomainfrom
fix-immediate-retirement
Sep 8, 2025
Merged

Don't immediately remove new committers#31
infinisil merged 1 commit intomainfrom
fix-immediate-retirement

Conversation

@infinisil
Copy link
Member

@infinisil infinisil commented Aug 30, 2025

Fixes NixOS/nixpkgs#30 by having the retirement script check whether the person was made a committer in the past year and exiting early in that case.

The committer addition times were manually back-filled based on the past years announcements in #60, but the sync script will add the times going forward.

For reference, here are the announcements:

I already tested this with the testing procedure, resulting in infinisil-test-org/nixpkgs-committers#25, but no other PR despite a new user without activity.

Fixes #30 by having
the retirement script check whether the person was made a committer in
the past year and exiting early in that case.

The committer addition times were manually back-filled based on the past years
announcements in https://github.com/NixOS/nixpkgs/issues/50105,
but the sync script will add the times going forward.
@infinisil infinisil requested a review from a team August 30, 2025 00:19
@infinisil infinisil linked an issue Aug 30, 2025 that may be closed by this pull request
Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM

Copy link

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wolfgang's trained me to read JavaScript for these sorts of things instead of bash. I hate to say it, but it is nicer in JavaScript. 🫣

Comment on lines +28 to +32
- A local Git clone of this repository with the `origin` remote set to the test repository:
```bash
git remote add upstream git@github.com:NixOS/nixpkgs-committers.git
git remote set-url origin git@github.com:infinisil-test-org/nixpkgs-committers.git
```

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is only needed because of the instructions below, as I read it, and not because the tool now relies on the git history. Is that correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually an unrelated change to just improve the testing, because the script always pushes to a remote named origin

I guess a separate commit would be in order, though I don't think it's essential


# Don't remove people that have been added recently
if [[ -s "$login" ]]; then
epochAdded=$(date --date="$(<"$login")" +%s)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I support these "member files" becoming JSON and having much more information in them, in the fullness of time.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard to imagine what could go in it that wouldn't be in the maintainer list 🤔

@infinisil infinisil merged commit 95eea30 into main Sep 8, 2025
@infinisil infinisil deleted the fix-immediate-retirement branch September 8, 2025 10:43
infinisil added a commit to infinisil-test-org/nixpkgs-committers that referenced this pull request Sep 18, 2025
After NixOS/nixpkgs-committers#31, people who
received commit access since a year ago were tracked with the date of
commit bit reception.

While this works, it's not necessary in the long term, because the git
history will keep track of when commit bits are given.

This change starts using the commit history when possible, which allows
avoiding the need for adding addition dates for new committers.
infinisil added a commit that referenced this pull request Sep 18, 2025
After #31, people who
received commit access since a year ago were tracked with the date of
commit bit reception.

While this works, it's not necessary in the long term, because the git
history will keep track of when commit bits are given.

This change starts using the commit history when possible, which allows
avoiding the need for adding addition dates for new committers.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don't retire committers immediately after becoming committers! cabal2nix install failure

4 participants