Reapply "Include Swift Build support in second stage bootstrap builds" #8373
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
owenv
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
xedin,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand and
bkhouri
as code owners
owenv
commented
Mar 16, 2025
| @@ -587,7 +592,7 @@ def install_file(args, src, destination, destination_is_directory=True, ignored_ | |||
|
|
|||
| logging.info("Installing %s to %s", src, dest) | |||
| if os.path.isdir(src): | |||
| shutil.copytree(src, dest, ignore=shutil.ignore_patterns(*ignored_patterns)) | |||
| shutil.copytree(src, dest, ignore=shutil.ignore_patterns(*ignored_patterns), dirs_exist_ok=True) | |||
There was a problem hiding this comment.
This is the one change from the original PR, to ensure that the resource bundles we install are replaced instead of erroring out if the builder contains content from another build.
|
@swift-ci test |
owenv
force-pushed
the
owenv/reapply-swift-build-install
branch
from
0ea048b to
e49d1da
Compare
|
@swift-ci please test |
|
@swift-ci please test Windows |
MaxDesiatov
reviewed
Mar 17, 2025
This reverts commit 6a2e45f. - Stop setting SWIFTPM_NO_SWBUILD_DEPENDENCY in the bootstrap script - Copy resource bundles required by Swift Build into the toolchain when installing
owenv
force-pushed
the
owenv/reapply-swift-build-install
branch
from
e49d1da to
fb53b3a
Compare
|
@swift-ci test |
|
@swift-ci test Windows |
jakepetroules
approved these changes
Mar 17, 2025
bkhouri
added a commit
to bkhouri/swift-package-manager
that referenced
this pull request
Apr 3, 2025
PR swiftlang#8373 (commit ID: 0193d5f) updated a shutil.copytree(...) command to pass in the `dirs_exists_ok=True` argument. However, Python added support for the `dirs_exists_ok` argument to `shutil.copytree` in 3.8. Update the function call to inspect the python version, and only add the argument if the script is running in a Python version equal, or higher than 3.8. rdar://147297864
bkhouri
added a commit
to bkhouri/swift-package-manager
that referenced
this pull request
Apr 3, 2025
PR swiftlang#8373 (commit ID: 0193d5f) updated a shutil.copytree(...) command to pass in the `dirs_exists_ok=True` argument. However, Python added support for the `dirs_exists_ok` argument to `shutil.copytree` in 3.8. Update the function call to inspect the python version, and only add the argument if the script is running in a Python version equal, or higher than 3.8. rdar://147297864
bkhouri
added a commit
that referenced
this pull request
Apr 4, 2025
PR #8373 (commit ID: 0193d5f) updated a `shutil.copytree(...)` command to pass in the `dirs_exists_ok=True` argument. However, Python added support for the `dirs_exists_ok` argument to `shutil.copytree` in 3.8. Update the function call to inspect the python version, and only add the argument if the script is running in a Python version equal, or higher than 3.8. rdar://147297864
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 reverts commit 6a2e45f.
There is one additional fix to the bootstrap script to allow overwriting directories when installing, to fix the incremental buildbot CI configuration.