-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Configure main-vs-deps #77408
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Configure main-vs-deps #77408
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,31 @@ | ||
| # Merges any changes from release/prerelease to main (e.g. servicing changes) | ||
| # See https://github.com/dotnet/arcade/blob/e52018a/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md | ||
|
|
||
| name: Flow main to release/dev18.0 | ||
| name: Inter-branch merge | ||
| on: | ||
| schedule: | ||
| # once a day at 13:00 UTC to cleanup old runs | ||
| - cron: '0 13 * * *' | ||
| push: | ||
| branches: | ||
| - main | ||
| workflow_dispatch: | ||
| inputs: | ||
| configuration_file_branch: | ||
| description: 'Branch to use for configuration file' | ||
| required: true | ||
| default: 'main' | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| check-script: | ||
| # The config does not support multiple flows from the same source branch, | ||
| # so we need to run separately for each duplicate source branch (https://github.com/dotnet/arcade/issues/15586). | ||
| merge: | ||
| uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main | ||
| with: | ||
| configuration_file_path: '.config/branch-merge.json' | ||
| configuration_file_path: 'eng/config/branch-merge.jsonc' | ||
| configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }} | ||
| merge-2: | ||
| uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main | ||
| with: | ||
| configuration_file_path: 'eng/config/branch-merge-2.jsonc' | ||
| configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| // Used by .github/workflows/main-merge.yml | ||
| { | ||
| "merge-flow-configurations": { | ||
| // Merge any main changes to main-vs-deps. | ||
| "main": { | ||
| "MergeToBranch": "main-vs-deps", | ||
| "ExtraSwitches": "-QuietComments" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we want to update merge PRs on push. I recommend using an every 3 hours schedule as the old GitHub Merge PR bot would.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, we can do that, although that works only for main, if we ever add other flows, they need the
pushtrigger (because the arcade script has$env:GITHUB_REFhardcoded as the source branch to merge).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. All the things I would change, if only I had more time.