Fix incremental builds for embedInCode resources
#7616
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
kateinoigakukun
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
francescomikulis and
xedin
as code owners
|
@swift-ci test |
kateinoigakukun
added
build system
|
@swift-ci test macOS |
|
@swift-ci test macos |
|
@swift-ci test windows |
|
Please do cherry-pick this for 6.0 with the usual release branch PR description template 🙏 |
|
CI is broken until the next branch of apple/llvm-project merges llvm/llvm-project@fecf5c7 |
|
@swift-ci test macOS |
|
@swift-ci test Windows |
kateinoigakukun
added a commit
that referenced
this pull request
Jun 4, 2024
**Explanation**: Fix a build system hole that incremental build did not detect changes in embedded resources. **Scope**: Incremental build with `embedInCode` feature **Risk**: Low. **Testing**: Added a new test to cover the incremental build case. **Original PR**: #7616 **Reviewers**: @MaxDesiatov
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.
SwiftPM's incremental build did not detect changes in embedded resources.
Motivation:
SwiftPM's
embedInCodefeature did not detect changes in the resource files and it led to using old resource contents even though they were modified.You can reproduce it with the fixture in this repository like below:
The first update ("update 1") is reflected in the final executable output because:
embedded_resources.swiftis generated while computing build descriptionsPackageStructurebuild cacheHowever, the second update ("update 2") is not updated because we don't re-compute build descriptions in this stage, and the llbuild build system does not track embedding resource files.
Modifications:
Generate
embedded_resources.swiftduring llbuild build step instead of during computing build descriptions.Result:
In this way, llbuild build system can correctly detect resource file modifications in any build iterations.