-
Notifications
You must be signed in to change notification settings - Fork 81
Add weekly merge workflow and update CI triggers #690
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
Conversation
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.
Pull Request Overview
This PR adds automated weekly merging functionality that merges the main branch into rel/weekly every Wednesday at 08:00 UTC. The build workflow is updated to trigger on pushes to the rel/weekly branch and when the weekly merge workflow completes, enabling continuous integration for the weekly release branch.
- Adds a scheduled workflow to automatically merge
mainintorel/weeklybranch weekly - Updates CI triggers to include the
rel/weeklybranch and workflow completion events - Configures proper Git permissions and automated commit handling for the merge process
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
.github/workflows/weekly-merge.yml |
New workflow file implementing the weekly merge automation with cron scheduling and manual trigger support |
.github/workflows/build.yml |
Updated CI triggers to include rel/weekly branch pushes and WeeklyMerge workflow completion events |
Comments suppressed due to low confidence (1)
.github/workflows/weekly-merge.yml:1
- [nitpick] The workflow name 'WeeklyMerge' should follow GitHub Actions naming conventions with spaces or hyphens for better readability. Consider 'Weekly Merge' or 'weekly-merge'.
name: WeeklyMerge
michael-hawker
left a comment
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.
Think we need a couple of more bits.
Co-authored-by: Michael Hawker MSFT (XAML Llama) <[email protected]>
michael-hawker
left a comment
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.
LGTM
This PR adds a
weekly-merge.ymlworkflow file that mergesmainintorel/weeklyon a chron schedule.When this merge happens, our usual
build.ymlwill be triggered and should diff with the merge from the week prior (the last push).If no incremental changes are found by our
build.yml, the build will exit early as usual.