ci(mergify): upgrade configuration to current format (#9051)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: anmolshres98 <anmolshres98@users.noreply.github.com>
Co-authored-by: Ben Polinsky <78756012+ben-polinsky@users.noreply.github.com>

Author: 3 people

.github/mergify.yml

@@ -1,11 +1,5 @@
 # Configuration file for mergify
 
-# Branch version variables
-variables:
-  current_minor: &current_minor "release/5.7.x"
-  previous_minor: &previous_minor "release/5.6.x"
-  previous_major: &previous_major "release/4.11.x"
-
 defaults:
   actions:
     backport:
@@ -44,6 +38,7 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - *current_minor
-          - *previous_minor
-          - *previous_major
+          - &current_minor "release/5.7.x"
+          - &previous_minor "release/5.6.x"
+          - &previous_major "release/4.11.x"
+

common/config/azure-pipelines/jobs/version-bump.yaml

@@ -114,11 +114,11 @@ jobs:
           # e.g. if this release is `release/5.0.x`, value in `gather-docs.yaml`
           # should be `release/4.<whatever_last_minor_release_version_was>.x`
           # additionally if major version bump, the `mergify.yml` also needs to be edited manually
-          # if this release is `release/5.0.x`, the branch variables in `mergify.yml` should be updated to look like:
-          # current_minor: &current_minor "release/5.0.x"
-          # previous_minor: &previous_minor null
-          # previous_major: &previous_major "release/4.<whatever_last_minor_release_version_was>.x"
-          # NOTE - previous_minor is intentionally set to null since there is no previous minor branch in a major release
+          # if this release is `release/5.0.x`, the branch entries in `mergify.yml` should be updated to look like:
+          #   - &current_minor "release/5.0.x"
+          #   - &previous_minor "release/4.<whatever_last_minor_release_version_was>.x"
+          #   - &previous_major "release/4.<whatever_last_minor_release_version_was>.x"
+          # NOTE - previous_minor should be set to the same value as previous_major in a major release since there is no previous minor branch
 
           if [ $((previousMinorVersion)) -lt 0 ]
           then
@@ -152,21 +152,21 @@ jobs:
           echo "Updating mergify.yml backport branches for $newCurrentMinor"
 
           # Get the current value of current_minor to move it to previous_minor
-          # Find the line containing current_minor in mergify.yml
-          currentMinorLine=$(grep "current_minor:" "$mergifyPath" | head -n 1)
+          # Find the line containing &current_minor in mergify.yml
+          currentMinorLine=$(grep "&current_minor " "$mergifyPath" | head -n 1)
           # Extract quoted string value from the line
-          currentMinorValue=$(echo "$currentMinorLine" | sed -n 's/.*current_minor: &current_minor "\([^"]*\)".*/\1/p')
+          currentMinorValue=$(echo "$currentMinorLine" | sed -n 's/.*&current_minor "\([^"]*\)".*/\1/p')
 
-          # If there was no quoted string found, or if it is null, exit with error
-          if [ -z "$currentMinorValue" ] || [ "$currentMinorValue" = "null" ]; then
+          # If there was no quoted string found, exit with error
+          if [ -z "$currentMinorValue" ]; then
             echo "Error: Unable to determine non-null current_minor value from $mergifyPath (line: $currentMinorLine)"
             exit 1
           fi
           echo "Moving current minor '$currentMinorValue' to previous minor and setting new current minor to '$newCurrentMinor'"
 
-          # Handle both quoted strings and null values for previous_minor (matches both "value" and null)
-          sed -ri "s|previous_minor: &previous_minor (\".*\"\|null)|previous_minor: \&previous_minor \"$currentMinorValue\"|" "$mergifyPath"
-          sed -i "s|current_minor: &current_minor \".*\"|current_minor: \&current_minor \"$newCurrentMinor\"|" "$mergifyPath"
+          # Update the inline YAML anchor entries in the branches list
+          sed -i "s|- &previous_minor \"[^\"]*\"|- \&previous_minor \"$currentMinorValue\"|" "$mergifyPath"
+          sed -i "s|- &current_minor \"[^\"]*\"|- \&current_minor \"$newCurrentMinor\"|" "$mergifyPath"
 
           # Commit and push changes
           git add "$mergifyPath"