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

[Conan] Fix qt and vtk builds #2573

Merged
merged 5 commits into from Jul 19, 2019

Conversation

@bilke
Copy link
Member

commented Jul 17, 2019

  • use qt/5.12.4@bincrafters/stable with some disabled options to minimize build times
    • added pkg-config to Jenkins Docker image, see bincrafters/community#880
    • updated vtk/8.2.0@bilke/testing to be compatible with the qt package, see also this VTK PR
    • this qt package will not be hosted on our Artifactory, so it will always build locally
  • added value outdated to option OGS_CONAN_BUILD
  • Jenkins always uses outdated build policy

@bilke bilke force-pushed the bilke:conan-outdated branch 4 times, most recently from 3554e0e to c5a6d89 Jul 17, 2019

@bilke bilke force-pushed the bilke:conan-outdated branch 3 times, most recently from e3d1098 to b722c3c Jul 18, 2019

@bilke bilke force-pushed the bilke:conan-outdated branch from b542230 to 2647fc6 Jul 18, 2019

@bilke bilke force-pushed the bilke:conan-outdated branch from 6c8b3cf to 482b088 Jul 19, 2019

@bilke bilke changed the title [Conan] Set build policy to outdated [Conan] Fix qt and vtk builds Jul 19, 2019

@bilke bilke marked this pull request as ready for review Jul 19, 2019

@bilke

This comment has been minimized.

Copy link
Member Author

commented Jul 19, 2019

Everything is green now.

@bilke bilke merged commit 922b2bc into ufz:master Jul 19, 2019

1 of 3 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
ufz.ogs in progress
Details
deploy/netlify Deploy preview ready!
Details

@bilke bilke deleted the bilke:conan-outdated branch Jul 19, 2019

Jenkinsfile Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.