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.

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

Fix Windows build on Azure #1095

Merged
merged 2 commits into from
Jun 22, 2020
Merged

Fix Windows build on Azure #1095

merged 2 commits into from
Jun 22, 2020

Conversation

sc1f
Copy link
Contributor

@sc1f sc1f commented Jun 19, 2020

BOOST_ROOT on Azure win64 got moved one level down into Boost/1.69.0/x86_64, which is breaking Azure builds.

This branch is on top of #1082 - that should be good to merge without doing a rebuild/re-CI, which would fail without this patch.

@sc1f sc1f added the internal Internal refactoring and code quality improvement label Jun 19, 2020
@timkpaine timkpaine added bug Concrete, reproducible bugs Python labels Jun 20, 2020
This was referenced Jun 21, 2020
Copy link
Member

@timkpaine timkpaine left a comment

Choose a reason for hiding this comment

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

looks like some autoformatting is making the diff huge

@sc1f
Copy link
Contributor Author

sc1f commented Jun 21, 2020

@timkpaine all the PRs need to go on top of manylinux and CRLF fix - I couldn’t do any local development without fixing CRLF first

@texodus
Copy link
Member

texodus commented Jun 22, 2020

Looks good! Thanks for the PR!

@texodus texodus merged commit 579aa7e into master Jun 22, 2020
@texodus texodus deleted the azure-windows-fix branch June 22, 2020 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Concrete, reproducible bugs internal Internal refactoring and code quality improvement Python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants