Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
33 changes: 33 additions & 0 deletions .github/workflows/inter-branch-merge-flow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Inter-branch merge workflow
# Uses the shared dotnet/arcade merge flow infrastructure to automatically
# create PRs when changes are pushed to source branches.
#
# Configuration is in /github-merge-flow.jsonc at the repository root.
# Currently configured merge paths:
# main → net11.0
#
# Key features (from arcade):
# - ResetToTargetPaths: auto-resets version files (global.json, eng/*, etc.)
# to target branch versions, avoiding common merge conflicts
# - QuietComments: reduces GitHub notification noise
# - Skips PRs when only Maestro bot commits exist
# - Detailed PR body with merge/conflict resolution instructions

name: Inter-branch merge workflow

on:
push:
branches:
- main

# Run every day at 3:00 AM UTC
schedule:
- cron: '0 3 * * *'

permissions:
contents: write
pull-requests: write

jobs:
Merge:
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
Comment thread
rolfbjarne marked this conversation as resolved.
13 changes: 13 additions & 0 deletions github-merge-flow.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Configuration for the inter-branch merge flow workflow.
// This file is read from the 'main' branch by the arcade-based merge flow.
// See: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml
{
"merge-flow-configurations": {
// Merge main into net11.0
"main": {
"MergeToBranch": "net11.0",
"ExtraSwitches": "-QuietComments",
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
}
}
Comment thread
rolfbjarne marked this conversation as resolved.
}
Loading