Merge release/6.2 into main
#605
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Add support for swift caching build when swift compiler supports the new option that allows swift compiler performs an uncached build but loading module dependencies from CAS. It also does few adjustment to make sure preview build shares the same dependencies with regular build as caching build has a stricter rule for invalidation: * The VFS overlay used by preview is applied after swift driver invocation and onto the frontend invocation directly. This makes sure the VFS overlay doesn't invalidate all the module dependencies. * BridgingHeader PCH was disabled as a workaround when swift driver doesn't produce deterministic output path when planning for PCH jobs. Properly fix this issue by requesting the same path when planning both build and don't use this workaround in certain configurations. This should allow preview to build thunk correctly when swift caching is enabled for the regular build. rdar://152107465 (cherry picked from commit 6c6309e)
This is required for System.FilePath to work correctly on Windows in release mode.
…build version in arm64/arm64e slices in the WatchKit stub binary more permissive Also tidy up the logic of these checks since they all are implicitly assuming a single build version per arch, and that's also needed to use the >= comparison. rdar://152870849
This allows projects to build more smoothly across platforms when architectures like arm64e are unconditionally appended to ARCHS. Simulators have never supported arm64e in any capacity. rdar://123839235
[6.2] Skip Windows tests triggering hangs in CI
…task, emit a test issue instead. rdar://153135551
This will be used for validating the new MODULE_DEPENDENCIES setting.
…-setting-6.2 [6.2] Add a new VALIDATE_MODULE_DEPENDENCIES setting
* Add String Catalog symbol generation support to SwiftBuild * Mark xcstrings as a type producing Swift sources
|
@swift-ci test |
owenv
requested review from
matthewseaman,
kulpreetchilana,
jakepetroules,
mirza-garibovic,
mhrawdon,
neonichu,
owenv and
aciidgh
as code owners
owenv
approved these changes
Jun 23, 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.