diff --git a/.github/workflows/merge-net11-to-release.yml b/.github/workflows/merge-net11-to-release.yml new file mode 100644 index 000000000000..ac13e47f9372 --- /dev/null +++ b/.github/workflows/merge-net11-to-release.yml @@ -0,0 +1,22 @@ +# Merge net11.0 → next release branch +# Target branch is configured in /github-merge-flow-release-11.jsonc (MergeToBranch) + +name: Merge net11.0 to next release + +on: + workflow_dispatch: + push: + branches: + - net11.0 + schedule: + - cron: '0 4 * * *' + +permissions: + contents: write + pull-requests: write + +jobs: + Merge: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main + with: + configuration_file_path: 'github-merge-flow-release-11.jsonc' diff --git a/github-merge-flow-release-11.jsonc b/github-merge-flow-release-11.jsonc new file mode 100644 index 000000000000..e691b33db918 --- /dev/null +++ b/github-merge-flow-release-11.jsonc @@ -0,0 +1,10 @@ +// Update MergeToBranch when cutting a new release. +{ + "merge-flow-configurations": { + "net11.0": { + "MergeToBranch": "release/11.0.1xx-preview3", + "ExtraSwitches": "-QuietComments", + "ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*" + } + } +}