[Commands] Don't blow away modified Packages. #373
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
- This adds a limited safety check that we don't let the current update workflow remove any modified repositories under `Packages`. It doesn't detect modifications to untracked files, but it should catch most cases. - Will add test coverage for this in the swift-integration-tests repo. (cherry picked from commit 48101cb)
aciidgh
pushed a commit
to aciidgh/swift-package-manager
that referenced
this pull request
Jan 11, 2019
[BuildSystem] Allow processes to release lanes
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.
workflow remove any modified repositories under
Packages. It doesn't detectmodifications to untracked files, but it should catch most cases.
(cherry picked from commit 48101cb)
Explanation: Our current implementation of
swift package updateworks by simply removing thePackagessubdirectory containing the dependencies, and recloning. However, this is problematic if a user has modified some of the sources there. This change prevents us from doing the removal if we detect modified files.Scope: Minimal, the change adds safety checks we run before performing the removal of
Packageswhich is done as part of package updating.Risk: Low, it increases our safety and is covered by automated tests in the swift-integration-tests repository.
Testing: Automated test here: swiftlang/swift-integration-tests@810defb