[6.0] Add --stash as alternative to --clean to update-checkout (#71178)
#72640
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
Use of `--clean` can lead to irreversible loss of uncommitted data. We still need to reset Swift project repositories to a clean state, but without deleting all in-progress changes. Passing `--stash` instead of (or in addition to) `--clean` will preserve uncommitted changes in stashes of corresponding repositories.
|
@swift-ci Please test |
rintaro
reviewed
Mar 28, 2024
MaxDesiatov
approved these changes
Mar 28, 2024
shahmishal
approved these changes
Mar 28, 2024
AnthonyLatsis
changed the title
--stash as alternative to --clean to update-checkout (#71178)--stash as alternative to --clean to update-checkout (#71178)
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.
Cherry picking #71178 to release/6.0.
We see some issues on our PR testing because update checkout command first checks out the associated branch (in this case 6.0) and we're missing this change. Something in the python byte code being on multiple processes causes it to recompile after the initial checkout to 6.0 is done, but still be called from the initial python process which was on main
https://ci.swift.org/job/apple-llvm-project-pr-macos/5081/console