Skip to content

Rework swift-stress-tester repo building #21523

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

Conversation

beccadax
Copy link
Contributor

@beccadax beccadax commented Dec 22, 2018

This change makes build-script-impl use a new, shared version of swift-stress-tester’s build-script-helper.py which also supports building swift-evolve. It also adds the necessary flags and variables to build swift-evolve from build-script.

This PR depends on swiftlang/swift-stress-tester#26, which moves the script to its new location and leaves a shim at the old name for compatibility. That PR has now landed, so this one can be merged when ready.

To do:

  • Get this reviewed by someone who knows their way around build-script
  • Land the matching commit first

This change makes build-script-impl use a new, shared version of swift-stress-tester’s build-script-helper.py which also supports building swift-evolve. It also adds the necessary flags and variables to build swift-evolve from build-script.
beccadax added a commit to beccadax/swift-stress-tester that referenced this pull request Jan 2, 2019
These changes allow an invocation to specify whether it should build SourceKitStressTester or SwiftEvolve. In theory, it should behave virtually identically for SourceKitStressTester, but also work for SwiftEvolve.

This commit also contains matching changes to SwiftEvolve’s package configuration. With those changes, it will build correctly *only* through build-script-helper.

Finally, it includes changes to evolve-swiftCore.sh to build SwiftEvolve through the swift build-script command. This won’t actually work until swiftlang/swift#21523 lands with that support, so evolve-swiftCore.sh is temporarily broken.
@beccadax
Copy link
Contributor Author

beccadax commented Jan 7, 2019

Please test with following pull request:
swiftlang/swift-stress-tester#26

@swift-ci Please Build Toolchain macOS Platform

@beccadax
Copy link
Contributor Author

beccadax commented Jan 7, 2019

(Using the toolchain build to test that swift-stress-tester will still build with these changes.)

@beccadax
Copy link
Contributor Author

beccadax commented Jan 8, 2019

Please test with following pull request:
swiftlang/swift-stress-tester#26

@swift-ci Please Build Toolchain macOS Platform

@swift-ci
Copy link
Contributor

swift-ci commented Jan 8, 2019

macOS Toolchain
Download Toolchain
Git Sha - e3e5754

Install command
tar -zxf swift-PR-21523-155-osx.tar.gz --directory ~/

@beccadax
Copy link
Contributor Author

beccadax commented Jan 9, 2019

@swift-ci please smoke test

@beccadax beccadax changed the title [WIP] [DNM] Rework swift-stress-tester repo building Rework swift-stress-tester repo building Jan 9, 2019
@beccadax beccadax requested a review from shahmishal January 9, 2019 02:50
@beccadax
Copy link
Contributor Author

beccadax commented Jan 9, 2019

@swift-ci please build toolchain

@beccadax
Copy link
Contributor Author

beccadax commented Jan 9, 2019

I'm not sure why the toolchain builds still show "pending"—they finished last night. Linux, macOS

@shahmishal
Copy link
Member

@brentdax This is a known issue, I will try to look into this issue. However, you should be able to download the toolchain.

@beccadax beccadax merged commit 9dd5d12 into swiftlang:master Jan 9, 2019
@beccadax beccadax deleted the build-script-impl-evolved-into-longer-build-script-impl branch January 10, 2019 00:20
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