diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index bbe126f9bcab..1824cb6c9ffd 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -718,7 +718,9 @@ configuration: - addLabel: label: partner/syncfusion description: Add 'partner/syncfusion' label to issues opened by the Syncfusion partner team - - if: + - description: '[Inter-branch merge] Auto-approve main to net11.0' + triggerOnOwnActions: false + if: - payloadType: Pull_Request - isPullRequest - isActivitySender: @@ -726,36 +728,75 @@ configuration: issueAuthor: False - isAction: action: Opened - - or: - - and: - - targetsBranch: - branch: net11.0 - - titleContains: - pattern: '^\[automated\] Merge branch ''main'' => ''net11\.0''$' - isRegex: True - - and: - - targetsBranch: - branch: release/11.0.1xx-preview7 - - titleContains: - pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-preview7''$' - isRegex: True - - and: - - targetsBranch: - branch: release/11.0.1xx-rc1 - - titleContains: - pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-rc1''$' - isRegex: True - - and: - - targetsBranch: - branch: release/11.0.1xx-rc2 - - titleContains: - pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-rc2''$' - isRegex: True + - titleContains: + pattern: '^\[automated\] Merge branch ''main'' => ''net11\.0''$' + isRegex: True + - targetsBranch: + branch: net11.0 + then: + - approvePullRequest: + comment: Auto-approved automated inter-branch merge. + - enableAutoMerge: + mergeMethod: merge + - description: '[Inter-branch merge] Auto-approve net11.0 to preview7' + triggerOnOwnActions: false + if: + - payloadType: Pull_Request + - isPullRequest + - isActivitySender: + user: github-actions[bot] + issueAuthor: False + - isAction: + action: Opened + - titleContains: + pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-preview7''$' + isRegex: True + - targetsBranch: + branch: release/11.0.1xx-preview7 + then: + - approvePullRequest: + comment: Auto-approved automated inter-branch merge. + - enableAutoMerge: + mergeMethod: merge + - description: '[Inter-branch merge] Auto-approve net11.0 to rc1' + triggerOnOwnActions: false + if: + - payloadType: Pull_Request + - isPullRequest + - isActivitySender: + user: github-actions[bot] + issueAuthor: False + - isAction: + action: Opened + - titleContains: + pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-rc1''$' + isRegex: True + - targetsBranch: + branch: release/11.0.1xx-rc1 + then: + - approvePullRequest: + comment: Auto-approved automated inter-branch merge. + - enableAutoMerge: + mergeMethod: merge + - description: '[Inter-branch merge] Auto-approve net11.0 to rc2' + triggerOnOwnActions: false + if: + - payloadType: Pull_Request + - isPullRequest + - isActivitySender: + user: github-actions[bot] + issueAuthor: False + - isAction: + action: Opened + - titleContains: + pattern: '^\[automated\] Merge branch ''net11\.0'' => ''release/11\.0\.1xx-rc2''$' + isRegex: True + - targetsBranch: + branch: release/11.0.1xx-rc2 then: - approvePullRequest: comment: Auto-approved automated inter-branch merge. - enableAutoMerge: mergeMethod: merge - description: '[Inter-branch merge] Auto-approve and enable auto-merge for exact forward-merge flows' onFailure: onSuccess: