Skip to content
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.

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

simplify bootstrap build #5939

Merged
merged 3 commits into from
Dec 7, 2022

Conversation

tomerd
Copy link
Contributor

@tomerd tomerd commented Dec 2, 2022

motivation: remove depednecy on workspace that carries over dependencies on source control and registry

changes:

  • move minimal-built-tool code into swift-bootstrap
  • add dependency resolution code swift-bootstrap so it does not require dependency on workspace
  • cleanup bootstrap arguments for those that can be hard coded
  • adjust target dependencies and cmake setup accordingly

@tomerd tomerd changed the title simplifiy bootstrap build simplify bootstrap build Dec 2, 2022
@tomerd tomerd force-pushed the feature/bootstrap-minimal-build branch 2 times, most recently from ec5fa8f to 0d84fd3 Compare December 2, 2022 02:16
@tomerd
Copy link
Contributor Author

tomerd commented Dec 2, 2022

@swift-ci smoke test

motivation: remove depednecy on workspace that carries over dependencies on source control and registry

changes:
* move minimal-built-tool code into swift-bootstrap
* add dependency resolution code swift-bootstrap so it does not require dependency on workspace
* cleanup bootstrap arguments for those that can be hard coded
* adjust target dependencies and cmake setup accordingly
@tomerd tomerd force-pushed the feature/bootstrap-minimal-build branch from 0d84fd3 to 3fed667 Compare December 2, 2022 02:27
@tomerd
Copy link
Contributor Author

tomerd commented Dec 2, 2022

@swift-ci smoke test

@tomerd
Copy link
Contributor Author

tomerd commented Dec 2, 2022

@swift-ci smoke test

@neonichu
Copy link
Contributor

neonichu commented Dec 2, 2022

🎉

@neonichu
Copy link
Contributor

neonichu commented Dec 2, 2022

Toolchain build passed ✅

@@ -229,8 +229,8 @@ public struct BuildParameters: Encodable {
hostTriple: Triple? = nil,
destinationTriple: Triple? = nil,
archs: [String] = [],
flags: BuildFlags,
xcbuildFlags: [String] = [],
flags: BuildFlags = .init(),
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this intentional? So far it seems like this was explicit.

@tomerd tomerd self-assigned this Dec 5, 2022
@tomerd
Copy link
Contributor Author

tomerd commented Dec 5, 2022

@swift-ci please smoke test

@tomerd
Copy link
Contributor Author

tomerd commented Dec 5, 2022

hmm

error: terminated(127): /tmp/Miscellaneous_TestDiscovery_Simple.kop1p8/Miscellaneous_TestDiscovery_Simple/.build/x86_64-unknown-linux-gnu/debug/SimplePackageTests.xctest --dump-tests-json output:
    /tmp/Miscellaneous_TestDiscovery_Simple.kop1p8/Miscellaneous_TestDiscovery_Simple/.build/x86_64-unknown-linux-gnu/debug/SimplePackageTests.xctest: error while loading shared libraries: libswift_RegexParser.so: cannot open shared object file: No such file or directory

does not seem to be related?

@tomerd
Copy link
Contributor Author

tomerd commented Dec 5, 2022

@swift-ci please smoke test linux

1 similar comment
@tomerd
Copy link
Contributor Author

tomerd commented Dec 6, 2022

@swift-ci please smoke test linux

@tomerd tomerd merged commit 4111569 into swiftlang:main Dec 7, 2022
neonichu added a commit that referenced this pull request Dec 7, 2022
Azoy pushed a commit that referenced this pull request Dec 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants