From e6dfd16d51b3c62b1194810ed4ae67d99214c0de Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Sun, 10 Aug 2025 13:07:09 -0500
Subject: [PATCH] Updated script logic and PR reviewers list (#31771)

- Updated script logic to only update the deadline if a new version of
macOS is released
- Updated PR reviewers list
---
 ...od-policy-updater-latest-1password-macos.sh |  5 ++---
 .../dogfood-policy-updater-latest-macos.sh     | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/dogfood-policy-updater-latest-1password-macos.sh b/.github/scripts/dogfood-policy-updater-latest-1password-macos.sh
index 5c78a5418f..39288841c5 100644
--- a/.github/scripts/dogfood-policy-updater-latest-1password-macos.sh
+++ b/.github/scripts/dogfood-policy-updater-latest-1password-macos.sh
@@ -115,9 +115,8 @@ if [ "$policy_version_number" != "$latest_1password_macos_version" ]; then
     # Prepare the reviewers data payload
     reviewers_data=$(jq -n \
         --arg r1 "harrisonravazzolo" \
-        --arg r2 "nonpunctual" \
-        --arg r3 "ddribeiro" \
-        '{reviewers: [$r1, $r2, $r3]}')
+        --arg r2 "tux234" \
+        '{reviewers: [$r1, $r2]}')
 
     # Request reviewers for the pull request
     review_response=$(curl -s -X POST \
diff --git a/.github/scripts/dogfood-policy-updater-latest-macos.sh b/.github/scripts/dogfood-policy-updater-latest-macos.sh
index 95e70434d4..6d8186ba2a 100644
--- a/.github/scripts/dogfood-policy-updater-latest-macos.sh
+++ b/.github/scripts/dogfood-policy-updater-latest-macos.sh
@@ -153,12 +153,21 @@ else
         echo "New deadline (4 Sundays from today): $new_deadline"
 
         # Check if team updates are needed
-        if [ "$current_workstations_version" != "$latest_macos_version" ] || [ "$current_workstations_deadline" != "$new_deadline" ]; then
+        # Only update deadline if there's a new macOS version
+        if [ "$current_workstations_version" != "$latest_macos_version" ]; then
+            team_updates_needed=true
+            updates_needed=true
+        elif [ "$current_workstations_deadline" != "$new_deadline" ] && [ "$policy_update_needed" = true ]; then
+            # Only update deadline if policy was updated (meaning there's a new version)
             team_updates_needed=true
             updates_needed=true
         fi
 
-        if [ "$current_workstations_canary_version" != "$latest_macos_version" ] || [ "$current_workstations_canary_deadline" != "$new_deadline" ]; then
+        if [ "$current_workstations_canary_version" != "$latest_macos_version" ]; then
+            team_updates_needed=true
+            updates_needed=true
+        elif [ "$current_workstations_canary_deadline" != "$new_deadline" ] && [ "$policy_update_needed" = true ]; then
+            # Only update deadline if policy was updated (meaning there's a new version)
             team_updates_needed=true
             updates_needed=true
         fi
@@ -257,9 +266,8 @@ if [ "$updates_needed" = true ]; then
     # Prepare the reviewers data payload
     reviewers_data=$(jq -n \
         --arg r1 "harrisonravazzolo" \
-        --arg r2 "nonpunctual" \
-        --arg r3 "ddribeiro" \
-        '{reviewers: [$r1, $r2, $r3]}')
+        --arg r2 "tux234" \
+        '{reviewers: [$r1, $r2]}')
 
     # Request reviewers for the pull request
     review_response=$(curl -s -X POST \