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

[Bootstrap] Consolidate some build_... functions into build_dependency #3582

Conversation

WowbaggersLiquidLunch
Copy link
Contributor

@WowbaggersLiquidLunch WowbaggersLiquidLunch commented Jul 1, 2021

This PR consolidates some build_... functions in bootstrap into build_dependency, as @abertelrud suggested in #3533's review. This removes some repetition.

some functions such as build_llbuild and build_swiftpm_with_cmake are are not consolidated, because they're more different.

Copy link
Member

@finagolfin finagolfin left a comment

Choose a reason for hiding this comment

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

One mistake, otherwise good.

@WowbaggersLiquidLunch WowbaggersLiquidLunch marked this pull request as draft July 1, 2021 17:27
@WowbaggersLiquidLunch WowbaggersLiquidLunch force-pushed the consolidate-bootstrap-build-functions branch 2 times, most recently from a46dab9 to 8192d74 Compare July 1, 2021 17:55
@WowbaggersLiquidLunch WowbaggersLiquidLunch marked this pull request as ready for review July 1, 2021 17:58
@WowbaggersLiquidLunch WowbaggersLiquidLunch changed the title [Bootstrap] Consolidate some build_... functions into build [Bootstrap] Consolidate some build_... functions into build_dependency Jul 1, 2021
@tomerd
Copy link
Contributor

tomerd commented Jul 1, 2021

cc @compnerd

@WowbaggersLiquidLunch WowbaggersLiquidLunch force-pushed the consolidate-bootstrap-build-functions branch 2 times, most recently from 7e316ac to cbbbff2 Compare July 2, 2021 22:12
@tomerd
Copy link
Contributor

tomerd commented Jul 7, 2021

@swift-ci please smoke test

@WowbaggersLiquidLunch WowbaggersLiquidLunch force-pushed the consolidate-bootstrap-build-functions branch from cbbbff2 to 19e4583 Compare July 8, 2021 18:15
@tomerd
Copy link
Contributor

tomerd commented Jul 8, 2021

@swift-ci smoke test

…ency`

This removes some repetition.

Some functions such as `build_llbuild` and `build_swiftpm_with_cmake` are not consolidated, because they're more different.
@WowbaggersLiquidLunch WowbaggersLiquidLunch force-pushed the consolidate-bootstrap-build-functions branch from 19e4583 to 99608ff Compare July 9, 2021 01:28
@abertelrud
Copy link
Contributor

@swift-ci please smoke test

@abertelrud
Copy link
Contributor

This seems ready to merge at this point, @neonichu do you agree?

@abertelrud
Copy link
Contributor

@swift-ci please test

@abertelrud
Copy link
Contributor

The full Linux test failure is unrelated, and didn't get as far as SwiftPM. The logs for the other macOS test and the smoke tests show that bootstrap is successfully being used (self-hosted doesn't use bootstrap, it looks like). So this can be merged.

@abertelrud abertelrud merged commit 1a146f4 into swiftlang:main Jul 9, 2021
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.

5 participants