Skip to content

Add GitHub action that automatically creates a PR to merge main into a release branch #986

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 1 commit into from
Apr 10, 2025

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Apr 9, 2025

In the first period after branching the release branch, we typically want to include all changes from main also in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.

Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow.

Example PR created by this job: ahoppen#2

…a release branch

In the first period after branching the release branch, we typically want to include all changes from `main` also in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.

Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow.
@ahoppen ahoppen force-pushed the auto-create-main-merge branch from 56f67e0 to f3253da Compare April 9, 2025 23:51
@shahmishal
Copy link
Member

This is awesome! Can you move it to swiftlang/github-workflows?

@ahoppen
Copy link
Member Author

ahoppen commented Apr 10, 2025

Create a PR to add a workflow for this in github-workflows: swiftlang/github-workflows#112. Merging this PR as-is for now and will switch to use the workflow in github-workflows once that’s merged.

@ahoppen ahoppen merged commit dffadd6 into swiftlang:main Apr 10, 2025
20 checks passed
@ahoppen ahoppen deleted the auto-create-main-merge branch April 10, 2025 15:38
ahoppen added a commit to ahoppen/swift-syntax that referenced this pull request Apr 10, 2025
…a release branch

In the first period after branching the release branch, we want to include many changes from `main` also in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.

Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow.

Similar to swiftlang/swift-format#986
ahoppen added a commit to ahoppen/swift-syntax that referenced this pull request Apr 10, 2025
…a release branch

In the first period after branching the release branch, we want to include many changes from `main` also in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.

Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow.

Similar to swiftlang/swift-format#986
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