Skip to content

Revert "Merge pull request #37114 from apple/revert-36377-NewDriverDefault" #37122

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
merged 1 commit into from
May 7, 2021

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Apr 28, 2021

This reverts commit 937e1a3, reversing
changes made to c2dc8e3.

A change originally merged in #36377 got reverted in: #37114

The reason for this is because SwiftDriver's CMake build behaves differently when using CMake Version <3.17 and some developers who were using an older CMake started hitting errors.

This PR reverts the revert, bringing back the new driver as the default installation.

Before it gets merged one of two things needs to happen:

  • Either bump the minimum required CMake version of Swift to 3.17 or 3.18 (Forum thread discussion: https://forums.swift.org/t/bump-cmake-version-to-3-18)
  • Introduce manual workarounds for the CMake issue encountered by the driver build when using older CMake. (paths for an executable need to be specified manually)

…wDriverDefault"

This reverts commit 937e1a3, reversing
changes made to a5440a8.
@artemcm
Copy link
Contributor Author

artemcm commented Apr 28, 2021

@swift-ci please test

@artemcm
Copy link
Contributor Author

artemcm commented Apr 28, 2021

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - ae2e856

@artemcm
Copy link
Contributor Author

artemcm commented Apr 29, 2021

With: swiftlang/swift-driver#619
@swift-ci please test

@artemcm
Copy link
Contributor Author

artemcm commented Apr 30, 2021

@swift-ci please test

@artemcm
Copy link
Contributor Author

artemcm commented Apr 30, 2021

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

swift-ci commented May 1, 2021

Build failed
Swift Test OS X Platform
Git Sha - ae2e856

@gottesmm
Copy link
Contributor

gottesmm commented May 2, 2021

@swift-ci test macOS platform

@gottesmm
Copy link
Contributor

gottesmm commented May 2, 2021

@swift-ci test

@swift-ci
Copy link
Contributor

swift-ci commented May 2, 2021

Build failed
Swift Test Linux Platform
Git Sha - ae2e856

@gottesmm
Copy link
Contributor

gottesmm commented May 2, 2021

@shahmishal looks like PR bots on Linux have cmake 3.16, not cmake 3.17.

@gottesmm
Copy link
Contributor

gottesmm commented May 2, 2021

Actually, I am incorrect. That is the cmake that we are building now. I am going to update to a newer cmake using update-checkout.

@gottesmm
Copy link
Contributor

gottesmm commented May 2, 2021

Once #37210 lands, we should be good to merge this. @shahmishal would be good to update the Linux bots as well so we don't build this. But I think for now I want to unblock this.

@artemcm
Copy link
Contributor Author

artemcm commented May 6, 2021

WIth swiftlang/swift-driver#619
@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented May 6, 2021

Build failed
Swift Test OS X Platform
Git Sha - ae2e856

@artemcm
Copy link
Contributor Author

artemcm commented May 6, 2021

WIth swiftlang/swift-driver#619
@swift-ci please test macOS platform

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