Skip to content

Include Swift Build support in second stage bootstrap builds #8334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Mar 10, 2025
Merged

Include Swift Build support in second stage bootstrap builds #8334

merged 2 commits into from
Mar 10, 2025

Conversation

owenv
Copy link
Contributor

@owenv owenv commented Mar 6, 2025

Stop setting SWIFTPM_NO_SWBUILD_DEPENDENCY in the bootstrap script - we've made changes to Swift Build which should allow it to be bootstrapped in these environments (it's still not part of swift-bootstrap itself though).

@owenv
Copy link
Contributor Author

owenv commented Mar 6, 2025

@swift-ci test

@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test macOS

@owenv owenv mentioned this pull request Mar 7, 2025
Open
@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test macOS

@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test

@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test Windows

@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test Windows platform

@owenv owenv force-pushed the owenv/swift-build-second-stage-bootstrap branch from f5acc1b to fbc8b58 Compare March 7, 2025 21:23
@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test

@owenv
Copy link
Contributor Author

owenv commented Mar 7, 2025

@swift-ci test Windows

jakepetroules
jakepetroules reviewed Mar 7, 2025
View reviewed changes
@owenv owenv force-pushed the owenv/swift-build-second-stage-bootstrap branch from fbc8b58 to e347c36 Compare March 8, 2025 00:16
@owenv
Copy link
Contributor Author

owenv commented Mar 8, 2025

@swift-ci test

@owenv
Copy link
Contributor Author

owenv commented Mar 8, 2025

@swift-ci test Windows

@owenv
Copy link
Contributor Author

owenv commented Mar 8, 2025

@swift-ci test Linux

@owenv owenv force-pushed the owenv/swift-build-second-stage-bootstrap branch from e347c36 to c1519f2 Compare March 8, 2025 20:12
@owenv
Copy link
Contributor Author

owenv commented Mar 10, 2025

@swift-ci test

@owenv
Copy link
Contributor Author

owenv commented Mar 10, 2025

@swift-ci test Windows

cmcgee1024
cmcgee1024 reviewed Mar 10, 2025
View reviewed changes
Sources/CoreCommands/Options.swift
help: .init("Specify alternate path to search for SwiftPM resources.", visibility: .hidden),
completion: .directory
)
public var packageManagerResourcesDirectory: AbsolutePath?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Should this be added to the command-line options in swift-bootstrap/main.swift too so that we can bootstrap building SwiftPM itself with the swiftbuild system someday?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swift Build still has a fallback to the resources directory in the build directory, which I think will cover this case

cmcgee1024
cmcgee1024 reviewed Mar 10, 2025
View reviewed changes
Utilities/bootstrap
@@ -809,7 +814,6 @@ def get_swiftpm_env_cmd(args):

if args.llbuild_link_framework:
env_cmd.append("SWIFTPM_LLBUILD_FWK=1")
env_cmd.append("SWIFTPM_NO_SWBUILD_DEPENDENCY=1")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: I wonder if the smoke test builds will pass with the dependency.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to get an earlier run passing, the latest test run just has minor tweaks so I think it'll work

cmcgee1024
cmcgee1024 approved these changes Mar 10, 2025
View reviewed changes
Copy link
Member

@cmcgee1024 cmcgee1024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. I posted a question and thought.

@owenv owenv merged commit f7c3efc into swiftlang:main Mar 10, 2025
5 checks passed
@owenv owenv mentioned this pull request Mar 13, 2025
Merged
gottesmm pushed a commit that referenced this pull request Mar 13, 2025
@owenv
Revert "Include Swift Build support in second stage bootstrap builds" (…
6a2e45f 
…#8366)

Reverts #8334

This seems to cause an issue in the incremental buildbots
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakepetroules jakepetroules jakepetroules approved these changes

@cmcgee1024 cmcgee1024 cmcgee1024 approved these changes

@dschaefer2 dschaefer2 dschaefer2 approved these changes

@bnbarham bnbarham Awaiting requested review from bnbarham bnbarham is a code owner

@MaxDesiatov MaxDesiatov Awaiting requested review from MaxDesiatov MaxDesiatov is a code owner

@xedin xedin Awaiting requested review from xedin xedin is a code owner

@shawnhyam shawnhyam Awaiting requested review from shawnhyam shawnhyam is a code owner

@bripeticca bripeticca Awaiting requested review from bripeticca bripeticca is a code owner

@plemarquand plemarquand Awaiting requested review from plemarquand plemarquand is a code owner

@bkhouri bkhouri Awaiting requested review from bkhouri bkhouri is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@owenv @jakepetroules @cmcgee1024 @dschaefer2