Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -718,5 +718,46 @@ configuration:
- addLabel:
label: partner/syncfusion
description: Add 'partner/syncfusion' label to issues opened by the Syncfusion partner team
- if:
- payloadType: Pull_Request
- isPullRequest
- isActivitySender:
user: github-actions[bot]
issueAuthor: False
- isActivitySender:
issueAuthor: True
- 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
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:
35 changes: 34 additions & 1 deletion .github/workflows/merge-main-to-net11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# - ResetToTargetPaths: auto-resets version files to target branch versions
# - QuietComments: reduces GitHub notification noise
# - Skips PRs when only Maestro bot commits exist
# - Updates existing open PR instead of creating new ones
# - Keeps each generated PR immutable while CI runs; later commits flow in the next PR

name: Merge main to net11.0

Expand All @@ -25,8 +25,41 @@ permissions:
contents: write
pull-requests: write

concurrency:
group: merge-main-to-net11
cancel-in-progress: false

jobs:
CheckForOpenMergePullRequest:
runs-on: ubuntu-latest
outputs:
should_run: ${{ steps.check.outputs.should_run }}
steps:
- name: Check for an open main to net11.0 merge PR
id: check
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY: ${{ github.repository }}
run: |
pr_number="$(gh pr list \
--repo "$REPOSITORY" \
--state open \
--head 'merge/main-to-net11.0' \
--base 'net11.0' \
--json number \
--jq '.[0].number // empty')"

if [[ -n "$pr_number" ]]; then
echo "Merge PR #$pr_number is still open; leaving its branch unchanged while CI runs."
echo "should_run=false" >> "$GITHUB_OUTPUT"
else
echo "No open main to net11.0 merge PR exists."
echo "should_run=true" >> "$GITHUB_OUTPUT"
fi

Merge:
needs: CheckForOpenMergePullRequest
if: needs.CheckForOpenMergePullRequest.outputs.should_run == 'true'
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
with:
configuration_file_path: 'github-merge-flow-net11.jsonc'
33 changes: 32 additions & 1 deletion .github/workflows/merge-net11-to-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,41 @@ permissions:
contents: write
pull-requests: write

concurrency:
group: merge-net11-to-release
cancel-in-progress: false

jobs:
CheckForOpenMergePullRequest:
if: github.ref_name == 'net11.0'
runs-on: ubuntu-latest
outputs:
should_run: ${{ steps.check.outputs.should_run }}
steps:
- name: Check for an open net11.0 to release merge PR
id: check
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY: ${{ github.repository }}
run: |
pr_number="$(gh pr list \
--repo "$REPOSITORY" \
--state open \
--json number,headRefName \
--jq '[.[] | select(.headRefName | startswith("merge/net11.0-to-release/"))][0].number // empty')"

if [[ -n "$pr_number" ]]; then
echo "Merge PR #$pr_number is still open; leaving its branch unchanged while CI runs."
echo "should_run=false" >> "$GITHUB_OUTPUT"
else
echo "No open net11.0 to release merge PR exists."
echo "should_run=true" >> "$GITHUB_OUTPUT"
fi

Merge:
needs: CheckForOpenMergePullRequest
# Only run if triggered from net11.0 (push trigger or correct workflow_dispatch)
if: github.ref_name == 'net11.0'
if: github.ref_name == 'net11.0' && needs.CheckForOpenMergePullRequest.outputs.should_run == 'true'
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
with:
configuration_file_path: 'github-merge-flow-release-11.jsonc'
Loading