Skip to content

Merge main into release/6.2 #1000

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 6 commits into from
Apr 18, 2025
Merged

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Apr 18, 2025

No description provided.

ahoppen added 6 commits April 10, 2025 08:40
Use workflow added by swiftlang/github-workflows#112 to create auto merge PR that merges `main` into `release/6.2`.
Use workflow in github-workflows to create auto merge PR
Grant write permissions for content an pull requests to auto merge GitHub action
When running `swift-format lint` in an Xcode run script phase and it exits with a non-zero exit code, the build will fail. This started happening since we treated all linter findings as errors in #943.

To fix this:
- Diagnose all findings as warnings again and exit with code 0 even if there are findings
- Resurrect `--strict` to treat all findings as errors and exit with 1 if there were any findings.

rdar://148389716
Make linter emit warnings instead of errors by default
@ahoppen ahoppen requested a review from a team as a code owner April 18, 2025 21:15
@ahoppen ahoppen merged commit 4d6bad1 into release/6.2 Apr 18, 2025
22 of 23 checks passed
@ahoppen ahoppen deleted the automerge/merge-main-2025-04-18_21-03 branch April 18, 2025 22: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.

2 participants