diff --git a/scripts/admin/setup_repo.sh b/scripts/admin/setup_repo.sh index b72a126..f8c432a 100755 --- a/scripts/admin/setup_repo.sh +++ b/scripts/admin/setup_repo.sh @@ -48,8 +48,8 @@ RULESET=$(cat <<'J' "parameters": { "required_approving_review_count": 1, "dismiss_stale_reviews_on_push": true, - "require_code_owner_review": false, - "require_last_push_approval": false, + "require_code_owner_review": true, + "require_last_push_approval": true, "required_review_thread_resolution": false, "require_extra_approval_for_unattributed_changes": true } @@ -106,7 +106,11 @@ J upsert_ruleset() { local ids # This repo's own rulesets only: an org ruleset with the same name can't be updated from here. - mapfile -t ids < <(gh api --paginate "repos/$REPO/rulesets?includes_parents=false" \ + # A read loop, not mapfile: macOS still ships bash 3.2. + ids=() + while IFS= read -r id; do + [ -n "$id" ] && ids+=("$id") + done < <(gh api --paginate "repos/$REPO/rulesets?includes_parents=false" \ --jq ".[] | select(.name==\"$1\") | .id" | sort -n) if [ "${#ids[@]}" -gt 1 ]; then # Deleting a ruleset is a call to make by hand, so update the oldest and say which others exist.