fix: deduplicate --help by emitting header comments, add GITHUB_REPOSITORY validation

- Replace duplicated --help heredocs with awk extraction of the header
  comment block in both scripts, eliminating content drift.
- Add GITHUB_REPOSITORY to required env var validation in
  extract-hotfix-versions.sh (was used with set -u but not validated).
- Pass --repo to 'gh pr list' so it works without a .git directory.
- Set GITHUB_REPOSITORY in bats test setup() for deterministic runs.
- Update test assertions to match uppercase header comment headings.

Author: paulmedynski

.github/scripts/cherry-pick-to-release.sh

@@ -66,29 +66,9 @@ set -euo pipefail
 
 # -- Runtime help -------------------------------------------------------------
 if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
-  cat <<'EOF'
-Usage: cherry-pick-to-release.sh
-
-Cherry-picks a merge commit into a release branch and opens a PR.
-
-Required environment variables:
-  VERSION            Hotfix version (e.g. "7.0.1")
-  MERGE_COMMIT_SHA   SHA of the merge commit
-  PR_NUMBER          Original PR number
-  PR_TITLE           Original PR title
-  GH_TOKEN           GitHub token
-  GITHUB_REPOSITORY  owner/repo (set by Actions)
-
-Behavior:
-  - Derives release branch from major.minor (7.0.1 → release/7.0)
-  - Skips if patch is already applied on the target branch
-  - Creates a clean PR on success, or a CONFLICTS PR on failure
-  - Milestone is set if it exists; otherwise a warning is logged
-
-Exit codes:
-  0  Success (including "already applied" — no PR created)
-  1  Error (e.g. version parse failure)
-EOF
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
   exit 0
 fi
 

.github/scripts/extract-hotfix-versions.sh

@@ -26,12 +26,13 @@
 #
 # REQUIRED ENVIRONMENT VARIABLES
 # ------------------------------
-#   LABELS        Comma-separated list of all label names on the PR.
-#   EVENT_ACTION  The GitHub event action: "closed" or "labeled".
-#   EVENT_LABEL   For 'labeled' events, the name of the label that was added.
-#                 Empty or unset for 'closed' events.
-#   PR_NUMBER     The pull request number (used to derive cherry-pick branch names).
-#   GH_TOKEN      GitHub token for API calls (gh CLI auth).
+#   LABELS             Comma-separated list of all label names on the PR.
+#   EVENT_ACTION       The GitHub event action: "closed" or "labeled".
+#   EVENT_LABEL        For 'labeled' events, the name of the label that was added.
+#                      Empty or unset for 'closed' events.
+#   PR_NUMBER          The pull request number (used to derive cherry-pick branch names).
+#   GH_TOKEN           GitHub token for API calls (gh CLI auth).
+#   GITHUB_REPOSITORY  Owner/repo (e.g. "dotnet/SqlClient"). Set automatically by Actions.
 #
 # OUTPUTS
 # -------
@@ -58,33 +59,17 @@ set -euo pipefail
 
 # -- Runtime help -------------------------------------------------------------
 if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
-  cat <<'EOF'
-Usage: extract-hotfix-versions.sh
-
-Parses "Hotfix X.Y.Z" labels from a GitHub PR and emits a JSON array for
-matrix fan-out.
-
-Required environment variables:
-  LABELS         Comma-separated label names on the PR
-  EVENT_ACTION   "closed" or "labeled"
-  EVENT_LABEL    The label just added (labeled events only)
-  PR_NUMBER      PR number
-  GH_TOKEN       GitHub token for gh CLI
-
-Output (written to $GITHUB_OUTPUT):
-  versions=["7.0.1","8.0.0"]
-
-Exit codes:
-  0  Success (including "nothing to do" — versions=[])
-  1  Error (e.g. no valid Hotfix labels on a 'closed' event)
-EOF
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
   exit 0
 fi
 
 # -- Input validation ---------------------------------------------------------
 : "${LABELS:?LABELS environment variable is required}"
 : "${EVENT_ACTION:?EVENT_ACTION environment variable is required}"
 : "${PR_NUMBER:?PR_NUMBER environment variable is required}"
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY environment variable is required}"
 
 # -- 'labeled' event: process only the newly added label ----------------------
 if [[ "${EVENT_ACTION}" == "labeled" ]]; then
@@ -114,7 +99,7 @@ if [[ "${EVENT_ACTION}" == "labeled" ]]; then
     exit 0
   fi
 
-  EXISTING_PR=$(gh pr list --head "${CHERRY_PICK_BRANCH}" --state all \
+  EXISTING_PR=$(gh pr list --repo "${GITHUB_REPOSITORY}" --head "${CHERRY_PICK_BRANCH}" --state all \
     --json number --jq 'length')
   if [[ "${EXISTING_PR}" -gt 0 ]]; then
     echo "A cherry-pick PR from '${CHERRY_PICK_BRANCH}' already exists. Skipping."

.github/scripts/tests/cherry-pick-to-release.bats

@@ -70,7 +70,7 @@ STUB
   run bash "${SCRIPT}" --help
   [ "$status" -eq 0 ]
   [[ "$output" == *"Cherry-picks a merge commit"* ]]
-  [[ "$output" == *"Required environment variables"* ]]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
 }
 
 @test "prints help text with -h" {

.github/scripts/tests/extract-hotfix-versions.bats

@@ -28,6 +28,7 @@ setup() {
   export EVENT_LABEL=""
   export PR_NUMBER="42"
   export GH_TOKEN="fake-token"
+  export GITHUB_REPOSITORY="dotnet/SqlClient"
 }
 
 teardown() {
@@ -45,7 +46,7 @@ get_versions() {
   run bash "${SCRIPT}" --help
   [ "$status" -eq 0 ]
   [[ "$output" == *"Parses"* ]]
-  [[ "$output" == *"Required environment variables"* ]]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
 }
 
 @test "prints help text with -h" {