Merge main into release/6.3
#1109
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lot projects To understand whether a PR breaks the formatting behavior of real-world code, add a GitHub action that formats a small set of pilot projects and ensures that `swift-format lint` does not produce any errors.
This change prevents the job from being triggered when `release/*` branches are synchronized on a fork.
Skip the `update-version` job on a fork
Add GitHub workflow to ensure formatting is not broken on a set of pilot projects
* print lint location and message in plain bold instead of white fixes #1087 * review: print source locations in plain text Co-authored-by: Tony Allevato <tony.allevato@gmail.com> * swap the colors for warning labels and diagnostic categories This aligns the color of warning labels with the Swift compiler by making them yellow instead of magenta. Diagnostic categories were changed to make them not share a color with the warning labels. --------- Co-authored-by: Tony Allevato <tony.allevato@gmail.com>
* Order conditionally-compiled imports * Order conditional imports based on configuration and add nested test case * Preserve comments at start of conditionally compiled block in OrderedImports * Add includeConditionalImports docs to OrderedImports.swift
Normalize release version to x.y.z in auto-update-version action
The diff yields more insightful results than `swift-format lint`
Exclude `"5.9"` from `windows_swift_versions` until #1094 is resolved on swift-markdown's side
Keep attributed getters intact in UseSingleLinePropertyGetter
Respect indentBlankLines when stripping whitespace inside block comment blank lines
Format source code and run `git diff` instead of listing first
Update release automerge from 6.2 to 6.3
5.9 has issues with swift-markdown's use of versioned `Package.swift` after the added use of unsafe flags (which are 6.2 only). 6.0 is over a year old now.
Bump to 6.0
bnbarham
requested review from
allevato,
bnbarham,
hamishknight,
rintaro and
shahmishal
as code owners
bnbarham
approved these changes
Dec 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.