Skip to content

Merge main into release/6.2 #990

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 7 commits into from
Apr 11, 2025

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Apr 10, 2025

Need to do this manually instead of through the GitHub action added by #986 because there was a merge conflict because we changed the default version in publish_release.yml both on main and release/6.2.

TTOzzi and others added 7 commits April 4, 2025 13:25
…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.
Change default release version for GitHub action releases to 603.0.0
Add GitHub action that automatically creates a PR to merge main into a release branch
@ahoppen ahoppen requested a review from a team as a code owner April 10, 2025 15:47
@ahoppen ahoppen merged commit 6242861 into swiftlang:release/6.2 Apr 11, 2025
20 checks passed
@ahoppen ahoppen deleted the merge-main-6.2-2025-04-10 branch April 11, 2025 20:10
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.

4 participants