Skip to content

Conversation

@Arlodotexe
Copy link
Member

@Arlodotexe Arlodotexe commented Jul 15, 2025

This PR adds a weekly-merge.yml workflow file that merges main into rel/weekly on a chron schedule.

When this merge happens, our usual build.yml will 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.

@Arlodotexe Arlodotexe self-assigned this Jul 15, 2025
Copy link

Copilot AI left a 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 main into rel/weekly branch weekly
  • Updates CI triggers to include the rel/weekly branch 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

@Arlodotexe Arlodotexe enabled auto-merge July 16, 2025 01:40
Copy link
Member

@michael-hawker michael-hawker left a 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.

Copy link
Member

@michael-hawker michael-hawker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Arlodotexe Arlodotexe merged commit 3605088 into main Jul 21, 2025
21 of 22 checks passed
@Arlodotexe Arlodotexe deleted the ci/releases/scheduled/weekly branch July 21, 2025 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants