Skip to content

Build indexstore-db and sourcekit-lsp in a unified SwiftPM build #60308

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

Merged

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Jul 29, 2022

This way we don’t need to build indexstore-db twice (once when building indexstore-db itself and once when building sourcekit-lsp). This reduced the smoke testing time by ~5 minutes.

@ahoppen ahoppen force-pushed the pr/unified-build-indexstore-db-sourcekit-lsp branch from 1f6b38e to 72c64ac Compare August 4, 2022 07:48
@ahoppen ahoppen changed the title WIP: Build indexstore-db and sourcekit-lsp in a unified build Build indexstore-db and sourcekit-lsp in a unified SwiftPM build Aug 4, 2022
@ahoppen ahoppen marked this pull request as ready for review August 5, 2022 14:43
@ahoppen ahoppen requested review from benlangmuir and bnbarham August 5, 2022 14:43
Comment on lines 4 to 19
<FileRef location = "group:../../../../indexstore-db"></FileRef>
<FileRef location = "group:../../../../llbuild"></FileRef>
<FileRef location = "group:../../../../sourcekit-lsp"></FileRef>
<FileRef location = "group:../../../../swift-argument-parser"></FileRef>
<FileRef location = "group:../../../../swift-collections"></FileRef>
<FileRef location = "group:../../../../swift-docc"></FileRef>
<FileRef location = "group:../../../../swift-driver"></FileRef>
<FileRef location = "group:../../../../swift-format"></FileRef>
<FileRef location = "group:../../../../swift-stress-tester/SourceKitStressTester"></FileRef>
<FileRef location = "group:../../../../swift-stress-tester/SwiftEvolve"></FileRef>
<FileRef location = "group:../../../../swift-syntax"></FileRef>
<FileRef location = "group:../../../../swift-system"></FileRef>
<FileRef location = "group:../../../../swift-tools-support-core"></FileRef>
<FileRef location = "group:../../../../swiftpm"></FileRef>
<FileRef location = "group:../../../../yams"></FileRef>
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this just be adding indexstore/lsp?

Copy link
Contributor

Choose a reason for hiding this comment

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

sourcekit-lsp brings in additional dependencies that are also added here

  • swift-argument-parser
  • swift-tools-support-core
  • swiftpm
    • llbuild
    • swift-system
    • swift-driver
      • yams
    • swift-collections

Actually, are we missing swift-crypto @ahoppen? https://github.com/apple/swift-package-manager/blob/73133d3f69d956f16adde38c07c6969e02d6e5a1/Package.swift#L606

Copy link
Member Author

Choose a reason for hiding this comment

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

I thought I had walked the entire dependency tree but apparently I missed that. Thanks for noticing

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, of course. I was only thinking about indexstore-db for some reason (I tagged on lsp at the end without really thinking about it). Thanks!

@ahoppen ahoppen force-pushed the pr/unified-build-indexstore-db-sourcekit-lsp branch from 72c64ac to 059128f Compare August 5, 2022 17:04
@ahoppen
Copy link
Member Author

ahoppen commented Aug 5, 2022

@swift-ci Please smoke test

@ahoppen
Copy link
Member Author

ahoppen commented Aug 5, 2022

@swift-ci Please build toolchain

@ahoppen ahoppen merged commit be741ca into swiftlang:main Aug 8, 2022
@ahoppen ahoppen deleted the pr/unified-build-indexstore-db-sourcekit-lsp branch August 8, 2022 07:36
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.

3 participants