Skip to content

presets: Update swift macos/linux preset #80717

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
Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

presets: Update swift macos/linux preset #80717

wants to merge 1 commit into from

Conversation

bkhouri
Copy link
Contributor

@bkhouri bkhouri commented Apr 10, 2025 •
edited
Loading

Create a common SwiftPM build preset configuration, and use this preset in the Swift PM macos and linux presets to ensure the swift presets builds the SwiftPM dependencies. In addition, include this preset in the Swift MacOS/Linux smoke test preset.

Required for: swiftlang/swift-package-manager#8495

@bkhouri bkhouri mentioned this pull request Apr 10, 2025
Merged
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 10, 2025

swiftlang/swift-package-manager#8476

@swift-ci test

@bkhouri bkhouri mentioned this pull request Apr 10, 2025
Merged
@bkhouri bkhouri marked this pull request as ready for review April 10, 2025 14:41
@bkhouri bkhouri marked this pull request as draft April 10, 2025 14:42
@bkhouri bkhouri requested a review from nate-chandler April 10, 2025 14:42
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 10, 2025 •
edited
Loading

I understand this may add additional time to the swift PR builds, but at least it will prevent changes in https://github.com/swiftlang/swift-package-manager from potentially impacting https://github.com/swiftlang/swift

bkhouri
bkhouri commented Apr 10, 2025
View reviewed changes
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 10, 2025

swiftlang/swift-package-manager#8476

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 10, 2025

swiftlang/swift-package-manager#8476

@swift-ci smoke test

bkhouri added a commit to swiftlang/swift-package-manager that referenced this pull request Apr 11, 2025
@bkhouri
Copy helpers internally (#8476)
1d48e0a 
Until #8223 is fixed copy some helpers from
`IntergrationTests/Source/IntegrationTests` to
`Test/_InternalTestSupport` so we can re-use the functionality.

Related to: #8433
rdar://148248105

Test with: swiftlang/swift#80717
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 11, 2025

This is no longer needed as a change was made in swiftlang/swift-package-manager#8476 to convert a test helper target to a testTarget.

@bkhouri bkhouri closed this Apr 11, 2025
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 14, 2025

swiftlang/swift-package-manager#8467

@swift-ci smoke test

@bkhouri bkhouri reopened this Apr 14, 2025
@bkhouri bkhouri force-pushed the t/main/install_swift_testing_in_smoke_test_preset branch from f1f95ba to fffc437 Compare April 14, 2025 14:25
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 14, 2025

swiftlang/swift-package-manager#8467

@swift-ci smoke test

@bkhouri bkhouri mentioned this pull request Apr 14, 2025
Draft
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 14, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 15, 2025

@swift-ci smoke test linux

@bkhouri bkhouri marked this pull request as ready for review April 15, 2025 12:44
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 15, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test linux

shahmishal
shahmishal requested changes Apr 15, 2025
View reviewed changes
Copy link
Member

@shahmishal shahmishal left a comment

Choose a reason for hiding this comment

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

We should look at what is missing in this preset compared to adding swiftpm mixin.

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 15, 2025

We should look at what is missing in this preset compared to adding swiftpm mixin.

With the lack of a common build configuration, I want to avoid changes to the Swift PM preset from impacting the swift repo preset. A simple change in Swift PM (swiftlang/swift-package-manager#8467) had to be reverted (although the CI builds all passed) because it impacted the swift CI builds. The revert is swiftlang/swift-package-manager#8474

I tried circumventing the presets by defining the targets as testTarget, but that caused issues in Xcode during a package resolution, so the change had to be reverted, yet again.

So, to get the 'helpers" functionality into SwiftPM repository, which I want to use as part of enabled additional testing in Swift PM, I opted to implemented this solution to ensure the swift repository builds the exact same things as the SwiftPM. Here, SwiftPM needs the Swift Testing library in the production code as it's creating some helper modules, that is used solely for the SwiftPM tests.

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 15, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri bkhouri marked this pull request as draft April 15, 2025 16:34
@bkhouri bkhouri force-pushed the t/main/install_swift_testing_in_smoke_test_preset branch from f3be738 to 585d8bd Compare April 16, 2025 19:09
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 16, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 16, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri bkhouri force-pushed the t/main/install_swift_testing_in_smoke_test_preset branch from 585d8bd to 1950191 Compare April 16, 2025 23:02
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 16, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

1 similar comment
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 17, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri bkhouri requested a review from shahmishal April 17, 2025 13:57
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 21, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri
presets: Update swift macos/linux preset
70d4825 
Create a common SwiftPM build preset configuration, and use this preset
in the Swift PM macos and linux presets to ensure the swift presets
builds the SwiftPM dependencies.  In addition, include this preset in
the Swift MacOS/Linux smoke test preset.
@bkhouri bkhouri force-pushed the t/main/install_swift_testing_in_smoke_test_preset branch from 1950191 to 70d4825 Compare April 21, 2025 12:26
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 21, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 21, 2025

swiftlang/swift-package-manager#8495

@swift-ci please smoke test linux

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nate-chandler nate-chandler Awaiting requested review from nate-chandler

@bnbarham bnbarham Awaiting requested review from bnbarham

@shahmishal shahmishal Awaiting requested review from shahmishal

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

Successfully merging this pull request may close these issues.
2 participants
@bkhouri @shahmishal