Skip to content

Merge main into release/6.2 #3067

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

Conversation

github-actions[bot]
Copy link

This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.

rintaro and others added 4 commits April 22, 2025 11:46
When the parser see `@abi` attribute without the language feature
enabled, not parsing the interior causes catastrophic breakage in the
tree. To avoid that, parse the argument decl is parsed, but instead of
generating `ABIAttributeArgumentsSyntax`, store it as a
`UnexpectedNodesSyntax` after the left-paren.
[SwiftParser] Parse @abi attribute arguments even without feature flag
…y for review

PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. But we don't want to re-trigger testing this when a normal user's PR is marked as ready for review.
Trigger PR testing when PR opened by GitHub Actions is marked as ready for review
@ahoppen ahoppen marked this pull request as ready for review April 28, 2025 09:41
@ahoppen ahoppen requested a review from a team as a code owner April 28, 2025 09:41
@ahoppen
Copy link
Member

ahoppen commented Apr 29, 2025

@swift-ci Please test

@bnbarham bnbarham enabled auto-merge April 29, 2025 18:50
@bnbarham bnbarham merged commit 5ce35b8 into release/6.2 Apr 29, 2025
28 checks passed
@bnbarham bnbarham deleted the automerge/merge-main-2025-04-28_09-39 branch April 29, 2025 20:52
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.

3 participants