Skip to content

[windows] Adapt Windows build script to latest changes. #27475

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
Oct 3, 2019

Conversation

drodriguez
Copy link
Contributor

LLDB in Windows was failing to build in the community CI. From comparing
the invocation of build-script-impl and windows-build.bat it seems that
we have migrated from LLDB_PATH_TO_*_SOURCE/BUILD variables to *_DIR
variables.

Additionally I needed to disable building the test on Windows because
the community CI doesn't build LLD, which seems to be needed for the
tests. I don't understand exactly why before the test were being skipped
automatically.

Also, a lot of CMake variables have been annotated with their expected
types. At least the new *_DIR variables were being interpreted as
strings in one occassion and the path separators were making CMake fail.
The other case was a boolean that must have been interpreted as a
string.

@compnerd: You might need to make some of these changes in the Azure CI configuration too, but I leave that to your decision. I also took the liberty to modify the documentation a little.

@drodriguez drodriguez requested a review from compnerd October 2, 2019 00:06
@drodriguez
Copy link
Contributor Author

@swift-ci please test Windows platform

@drodriguez
Copy link
Contributor Author

I log into the machine and it seemed to not have applied the patch when testing. I have cleaned the build directory to try to get a clean start. I will keep an eye while the next run happens.

@swift-ci please test Windows platform

@drodriguez drodriguez force-pushed the batch-script-lldb-fixes branch from c203f8a to 9a768d1 Compare October 2, 2019 01:52
@drodriguez
Copy link
Contributor Author

Don't go breaking my lines 🎶

@swift-ci please test Windows platform

@compnerd
Copy link
Member

compnerd commented Oct 2, 2019

@swift-ci please test Windows platform

@compnerd
Copy link
Member

compnerd commented Oct 2, 2019

@swift-ci please smoke test

1 similar comment
@compnerd
Copy link
Member

compnerd commented Oct 2, 2019

@swift-ci please smoke test

@drodriguez
Copy link
Contributor Author

Modified CI machines Python installation to match the expected installation from Visual Studio.

@swift-ci please test Windows platform

@drodriguez
Copy link
Contributor Author

I don't think the failing macOS LLDB is related. Retrying just in case it is flaky.

@swift-ci please smoke test macOS platform

@drodriguez
Copy link
Contributor Author

Retrying after modifying the installation again.

@swift-ci please test Windows platform

@drodriguez drodriguez force-pushed the batch-script-lldb-fixes branch from 9a768d1 to aa8a41d Compare October 2, 2019 20:50
@drodriguez
Copy link
Contributor Author

Removed the docs that were modified in another PR.

@swift-ci please test Windows platform

@drodriguez
Copy link
Contributor Author

@swift-ci please smoke test

@drodriguez
Copy link
Contributor Author

@swift-ci please test Windows platform

LLDB in Windows was failing to build in the community CI. From comparing
the invocation of build-script-impl and windows-build.bat it seems that
we have migrated from LLDB_PATH_TO_*_SOURCE/BUILD variables to *_DIR
variables.

Additionally I needed to disable building the test on Windows because
the community CI doesn't build LLD, which seems to be needed for the
tests. I don't understand exactly why before the test were being skipped
automatically.

Also, a lot of CMake variables have been annotated with their expected
types. At least the new *_DIR variables were being interpreted as
strings in one occassion and the path separators were making CMake fail.
The other case was a boolean that must have been interpreted as a
string.
@drodriguez drodriguez force-pushed the batch-script-lldb-fixes branch from aa8a41d to 7c1c58e Compare October 2, 2019 21:52
@drodriguez
Copy link
Contributor Author

LLDB_ALLOW_STATIC_BINDINGS was mispelled as LLVM_ALLOW_STATIC_BINDINGS in the original version. 🤦‍♂

@swift-ci please test Windows platform

@drodriguez
Copy link
Contributor Author

@swift-ci please smoke test

@drodriguez
Copy link
Contributor Author

@compnerd: it wasn't reported back here, but https://ci-external.swift.org/view/Pull%20Request/job/swift-PR-windows/122/ failed during the tests of Swift. LLDB was built (which was the main blockage). We can either merge as is, or wait for the tests to be fixed. I will try to start looking at them, but feel free to merge if you think is better (IMO fixing the tests in different PRs might be).

@drodriguez
Copy link
Contributor Author

See #27510 for a fix of some of the tests, and a summary of others that failed in this PR.

@compnerd compnerd merged commit bb4f46f into swiftlang:master Oct 3, 2019
@drodriguez drodriguez deleted the batch-script-lldb-fixes branch October 3, 2019 17:58
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.

2 participants