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.

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

Build and install swift-testing in toolchains #74582

Closed
wants to merge 6 commits into from
Closed

Build and install swift-testing in toolchains #74582

wants to merge 6 commits into from

Conversation

stmontgomery
Copy link
Contributor

As mentioned in the (now approved) A New Direction for Testing in Swift vision document, we're planning to include the swift-testing project in Swift toolchains soon. In preparation for that, this adds swift-testing to the update-checkout script, to its main branch scheme. This PR does not introduce any changes to the build process.

@stmontgomery stmontgomery added the update-checkout Area → utils: the `update-checkout` script label Jun 20, 2024
@stmontgomery stmontgomery requested a review from briancroom June 20, 2024 18:46
@stmontgomery stmontgomery self-assigned this Jun 20, 2024
@stmontgomery stmontgomery requested a review from shahmishal as a code owner June 20, 2024 18:46
@stmontgomery
Copy link
Contributor Author

@swift-ci please smoke test

@grynspan
Copy link
Contributor

The swift-testing repo hasn't moved to swiftlang yet. Does that affect this PR?

@stmontgomery
Copy link
Contributor Author

The swift-testing repo hasn't moved to swiftlang yet. Does that affect this PR?

Right now, this PR is still using the current /apple organization for swift-testing. We'll want to ensure that at the point we merge this PR, it's using whatever the correct organization is at that time. But that said, the old URLs should redirect so it should be safe regardless.

@stmontgomery stmontgomery changed the title Add swift-testing to update-checkout Build and install swift-testing in toolchains Jul 10, 2024
@stmontgomery stmontgomery marked this pull request as draft July 10, 2024 18:42
@stmontgomery stmontgomery added build-script Area → utils: The build script utils Area: the build system and other accessory scripts under the "utils" directory labels Jul 11, 2024
@stmontgomery stmontgomery mentioned this pull request Jul 12, 2024
Closed
@stmontgomery
Fix header comment
c867901
@stmontgomery
Temporarily disable some SwiftPM tests. I believe they are failing du…
7f0900c 
…e to this PR but need to disable them to get a complete toolchain so I can inspect things more deeply
@stmontgomery
Copy link
Contributor Author

Please test with following pull request:
swiftlang/swift-testing#531

@swift-ci Please Build Toolchain macOS Platform

@stmontgomery
Copy link
Contributor Author

Please test with following pull request:
swiftlang/swift-testing#531

@swift-ci Please Build Toolchain Linux Platform

@grynspan
Copy link
Contributor

Linux failure is in Foundation, not Swift Testing.

@stmontgomery
Copy link
Contributor Author

The Linux failure should be resolved in swiftlang/swift-foundation#748

@stmontgomery
Copy link
Contributor Author

Please test with following pull request:
swiftlang/swift-testing#531

@swift-ci Please Build Toolchain Linux Platform

edymtt
edymtt reviewed Jul 23, 2024
View reviewed changes
utils/swift_build_support/swift_build_support/productpipeline_list_builder.py
@@ -101,7 +101,7 @@ def add_product(self, product_cls, is_enabled):
self.current_pipeline.append(product_cls, is_enabled)

def add_impl_product(self, product_cls, is_enabled):
"""Add a non-impl product to the current pipeline begin constructed"""
"""Add an impl product to the current pipeline begin constructed"""
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice catch!

utils/swift_build_support/swift_build_support/products/swift_testing.py
Comment on lines +34 to +35
return [swift.Swift,
swiftsyntax.SwiftSyntax]
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no need to wait for SwiftSyntax -- in the build we are using the swift syntax libraries that we build in the Swift compiler for plugins

Suggested change
return [swift.Swift,
swiftsyntax.SwiftSyntax]
return [swift.Swift]

@rintaro rintaro mentioned this pull request Aug 3, 2024
Merged
@grynspan
Copy link
Contributor

grynspan commented Aug 7, 2024

Closing on @stmontgomery's behalf as @rintaro has superseded it with #75515.

@grynspan grynspan closed this Aug 7, 2024
@plemarquand plemarquand mentioned this pull request Aug 7, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edymtt edymtt edymtt left review comments

@shahmishal shahmishal shahmishal left review comments

@grynspan grynspan grynspan left review comments

@briancroom briancroom briancroom approved these changes

Assignees

@stmontgomery stmontgomery

Labels
build-script Area → utils: The build script update-checkout Area → utils: the `update-checkout` script utils Area: the build system and other accessory scripts under the "utils" directory
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@stmontgomery @grynspan @briancroom @edymtt @shahmishal