Implement retirement delay by closing PR

Before this change, there was no way to delay retirements other than
leaving the PR open indefinitely.

This change makes it so that the retire script checks whether a
corresponding retirement was closed recently, in which case it doesn't
open another.

Author: infinisil

.github/workflows/retire.yml

@@ -37,8 +37,7 @@ jobs:
           # Fetch full history to determine when committers were added
           fetch-depth: 0
       - name: Run script
-        # One month plus a bit of leeway
-        run: scripts/retire.sh NixOS nixpkgs nixpkgs-committers members "yesterday 1 month ago"
+        run: scripts/retire.sh NixOS nixpkgs nixpkgs-committers members "yesterday 1 month ago" "1 year ago"
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
           PROD: "1"

README.md

@@ -28,6 +28,8 @@ The PR will ping the user and inform them that it will by default be merged and
 If the PR is still open one month later,
 an automated comment will be posted with the next steps for the Nixpkgs commit delegators.
 
+If the PR is closed, retirement is delayed by another year.
+
 ## Automation setup
 
 Automation depends on a GitHub App with the following permissions:

scripts/README.md

@@ -72,40 +72,47 @@ The following sequence tests all code paths:
 
 1. Run the script with the `active` repo argument to simulate CI running without inactive users:
    ```bash
-   scripts/retire.sh infinisil-test-org active nixpkgs-committers members-test 'yesterday 1 month ago'
+   scripts/retire.sh infinisil-test-org active nixpkgs-committers members-test 'yesterday 1 month ago' now
    ```
 
    Check that no PR would be opened.
 2. Run the script with the `empty` repo argument to simulate CI running with inactive users:
 
    ```bash
-   scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago'
+   scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago' now
    ```
 
    Check that it would only create a PR for your own user and not the "new-committer-1" or "new-committer-2" user before running it again with `PROD=1` to actually do it:
 
    ```bash
-   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago'
+   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago' now
    ```
 
    Check that it created the PR appropriately, including assigning the "retirement" label.
    You can undo this step by closing the PR.
 3. Run it again to simulate CI running again later:
    ```bash
-   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago'
+   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test 'yesterday 1 month ago' now
    ```
    Check that no other PR is opened.
-4. Run it again with `now` as the date to simulate the time interval passing:
+4. Run it again with `now` as the notice cutoff date to simulate the time interval passing:
    ```bash
-   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test now
+   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test now now
    ```
    Check that it undrafted the previous PR and posted an appropriate comment.
 5. Run it again to simulate CI running again later:
    ```bash
-   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test now
+   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test now now
    ```
-6. Reset by marking the PR as a draft again.
-7. Run it again with the `active` repo argument to simulate activity during the time interval:
+   Check that no other PR is opened.
+6. Reset by marking the PR as a draft again, then run it again with the `active` repo argument to simulate activity during the time interval:
+   ```bash
+   PROD=1 scripts/retire.sh infinisil-test-org active nixpkgs-committers members-test now now
+   ```
+   Check that it gets undrafted with a comment listing the new activity.
+8. Close the PR, then run the script again with no activity and for an earlier close cutoff, simulating that the retirement was delayed:
    ```bash
-   PROD=1 scripts/retire.sh infinisil-test-org active nixpkgs-committers members-test now
+   PROD=1 scripts/retire.sh infinisil-test-org empty nixpkgs-committers members-test now '1 day ago'
    ```
+
+   Check that no other PR is opened.

scripts/retire.sh

@@ -26,7 +26,7 @@ effect() {
 }
 
 usage() {
-  log "Usage: $0 ORG ACTIVITY_REPO MEMBER_REPO DIR NOTICE_CUTOFF"
+  log "Usage: $0 ORG ACTIVITY_REPO MEMBER_REPO DIR NOTICE_CUTOFF CLOSE_CUTOFF"
   exit 1
 }
 
@@ -35,12 +35,15 @@ ACTIVITY_REPO=${2:-$(usage)}
 MEMBER_REPO=${3:-$(usage)}
 DIR=${4:-$(usage)}
 NOTICE_CUTOFF=${5:-$(usage)}
+CLOSE_CUTOFF=${6:-$(usage)}
 
 mainBranch=$(git branch --show-current)
 noticeCutoff=$(date --date="$NOTICE_CUTOFF" +%s)
 
 # People that received the commit bit after this date won't be retired
 newCutoff=$(date --date="1 year ago" +%s)
+# Users whose retirement PRs were closed after this date won't be retired
+closeCutoff=$(date --date="$CLOSE_CUTOFF" +%s)
 
 # We need to know when people received their commit bit to avoid retiring them within the first year.
 # For now this is done either with the git creation date of the file, or its contents:
@@ -96,6 +99,23 @@ for login in *; do
     receptionEpoch=$fileCommitEpoch
   fi
 
+  # Latest retirement PR, whether draft, open or closed
+  branchName=retire-$login
+  prInfo=$(trace gh api -X GET /repos/"$ORG"/"$MEMBER_REPO"/pulls \
+    -f state=all \
+    -f head="$ORG":"$branchName" \
+    --jq '.[0]')
+  if [[ -n "$prInfo" ]]; then
+    prState=$(jq -r .state <<< "$prInfo")
+  else
+    prState=none
+  fi
+
+  if [[ "$prState" == closed ]] && resetEpoch=$(jq '.closed_at | fromdateiso8601' <<< "$prInfo") && (( closeCutoff < resetEpoch )); then
+    log "$login had a retirement PR that was closed recently, skipping retirement check"
+    continue
+  fi
+
   # If the commit bit was received after the cutoff date, don't retire in any case
   if (( newCutoff < receptionEpoch )); then
     log "$login became a committer less than 1 year ago, skipping retirement check"
@@ -119,10 +139,8 @@ for login in *; do
     > "$tmp/$login"
   activityCount=$(wc -l <"$tmp/$login")
 
-  branchName=retire-$login
-  prInfo=$(trace gh api -X GET /repos/"$ORG"/"$MEMBER_REPO"/pulls -f head="$ORG":"$branchName" --jq '.[0]')
-  if [[ -n "$prInfo" ]]; then
-    # If there is a PR already
+  if [[ "$prState" == open ]]; then
+    # If there is an open PR already
     prNumber=$(jq .number <<< "$prInfo")
     epochCreatedAt=$(jq '.created_at | fromdateiso8601' <<< "$prInfo")
     if jq -e .draft <<< "$prInfo" >/dev/null && (( epochCreatedAt < noticeCutoff )); then