[vcpkg] Harden file removals and clean directory contents in "CI" inside vcpkg itself. #11432
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
…ide vcpkg itself. files.h/files.cpp: * Add end and else comments to all macros. * Add "remove_all_inside" function which empties a directory without actually deleting the directory. This is necessary to handle the case where the directory is actually a directory symlink. * Change remove_all to use std::remove when VCPKG_USE_STD_FILESYSTEM is set; this will engage POSIX delete support available on current Win10. commands.ci.cpp: empty "installed", "packages", and "buildtrees". */initialize_environment.*: No longer clean the directories outside the tool. * ci-step.ps1: Remove unused console output tee-ing.
BillyONeal
commented
May 19, 2020
…leaned down the line. Test that the installed directory is a directory before attempting to clean.
BillyONeal
added
category:infrastructure
strega-nil
reviewed
May 19, 2020
| @@ -4,29 +4,20 @@ | |||
|
|
|||
| # Sets up the environment for MacOS runs of vcpkg CI | |||
|
|
|||
| rm -rf installed || true | |||
There was a problem hiding this comment.
Is this okay? Don't we still need to remove this before vcpkg ci?
There was a problem hiding this comment.
No, this change makes the ci command itself do that: https://github.com/microsoft/vcpkg/pull/11432/files#diff-2b467942d4ff71ffedfb2c0396ee333dR401
strega-nil
approved these changes
May 19, 2020
strega-nil
pushed a commit
to strega-nil/vcpkg
that referenced
this pull request
May 5, 2021
…ide vcpkg itself. (microsoft#11432) `files.h/files.cpp`: * Add end and else comments to all macros. * Add "remove_all_inside" function which empties a directory without actually deleting the directory. This is necessary to handle the case where the directory is actually a directory symlink. * Change remove_all to use std::remove when VCPKG_USE_STD_FILESYSTEM is set; this will engage POSIX delete support available on current Win10. `commands.ci.cpp`: empty "installed". `*/initialize_environment.*`: No longer clean the directories outside the tool. `ci-step.ps1`: Remove unused console output tee-ing.
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.
files.h/files.cpp:commands.ci.cpp: empty "installed".*/initialize_environment.*: No longer clean the directories outside the tool.ci-step.ps1: Remove unused console output tee-ing.Fixes #11395 (hopefully)