mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
Update dogfood-policy-updater-latest-macos.sh (#33037)
- Updated formatting of auto-generated pull requests
This commit is contained in:
parent
beb03cec09
commit
072bba770e
1 changed files with 9 additions and 18 deletions
|
|
@ -104,16 +104,6 @@ previous_major_version=$((latest_major_version - 1))
|
|||
# Find the latest version of the previous major version
|
||||
previous_major_latest_version=$(echo "$macos_versions" | grep "^$previous_major_version\." | head -n 1)
|
||||
|
||||
# If no previous major version found, find the most recent stable version (not the latest)
|
||||
# This handles cases where the latest version is very new and we want to include a stable fallback
|
||||
if [ -z "$previous_major_latest_version" ]; then
|
||||
# Look for the most recent version that's not the latest (skip duplicates)
|
||||
previous_major_latest_version=$(echo "$macos_versions" | grep -v "^$latest_macos_version$" | head -n 1)
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
echo "No previous major version found, using most recent stable version: $previous_major_latest_version"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$latest_macos_version" ]; then
|
||||
echo "Error: Failed to fetch the latest macOS version."
|
||||
exit 1
|
||||
|
|
@ -121,9 +111,9 @@ fi
|
|||
|
||||
echo "Latest macOS version: $latest_macos_version"
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
echo "Stable fallback version: $previous_major_latest_version"
|
||||
echo "Latest previous major version (v$previous_major_version): $previous_major_latest_version"
|
||||
else
|
||||
echo "Warning: No stable fallback version found"
|
||||
echo "Warning: No previous major version found for v$previous_major_version"
|
||||
fi
|
||||
|
||||
# Initialize update flags
|
||||
|
|
@ -167,11 +157,11 @@ if [ "$policy_latest_version" != "$latest_macos_version" ]; then
|
|||
echo "Policy needs update: latest version changed from $policy_latest_version to $latest_macos_version"
|
||||
fi
|
||||
|
||||
# If we have a stable fallback version, check if it's included in the policy
|
||||
# If we have a previous major version, check if it's included in the policy
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
if ! echo "$policy_versions" | grep -q "^$previous_major_latest_version$"; then
|
||||
policy_needs_update=true
|
||||
echo "Policy needs update: stable fallback version $previous_major_latest_version not found in policy"
|
||||
echo "Policy needs update: previous major version $previous_major_latest_version not found in policy"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -282,7 +272,7 @@ if [ "$updates_needed" = true ]; then
|
|||
# Create commit message
|
||||
commit_message="Update macOS version to $latest_macos_version"
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
commit_message="$commit_message (includes stable fallback: $previous_major_latest_version)"
|
||||
commit_message="$commit_message (includes previous major v$previous_major_version: $previous_major_latest_version)"
|
||||
fi
|
||||
|
||||
if [ "$policy_update_needed" = true ]; then
|
||||
|
|
@ -291,7 +281,7 @@ if [ "$updates_needed" = true ]; then
|
|||
- Updated policy to include latest version: $latest_macos_version"
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
commit_message="$commit_message
|
||||
- Updated policy to include stable fallback version: $previous_major_latest_version"
|
||||
- Updated policy to include previous major version: $previous_major_latest_version"
|
||||
fi
|
||||
if [ -n "$policy_latest_version" ]; then
|
||||
commit_message="$commit_message
|
||||
|
|
@ -310,9 +300,10 @@ if [ "$updates_needed" = true ]; then
|
|||
git push origin "$NEW_BRANCH"
|
||||
|
||||
# Create a pull request
|
||||
pr_title="Update macOS version to $latest_macos_version"
|
||||
if [ -n "$previous_major_latest_version" ]; then
|
||||
pr_title="$pr_title (includes stable fallback: $previous_major_latest_version)"
|
||||
pr_title="Update latest macOS versions to $latest_macos_version and $previous_major_latest_version"
|
||||
else
|
||||
pr_title="Update latest macOS version to $latest_macos_version"
|
||||
fi
|
||||
pr_data=$(jq -n --arg title "$pr_title" \
|
||||
--arg head "$NEW_BRANCH" \
|
||||
|
|
|
|||
Loading…
Reference in a new issue