Feature/508 remove deployment admin bundle #664
Conversation
Codecov Report
@@ Coverage Diff @@
## master #664 +/- ##
==========================================
- Coverage 81.61% 81.60% -0.02%
==========================================
Files 260 260
Lines 34677 34677
==========================================
- Hits 28303 28298 -5
- Misses 6374 6379 +5 see 4 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
Note I made a typo with the feature issue nr. So |
conanfile.py
Outdated
| or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi | ||
| or self.options.build_launcher): | ||
| self.requires("libcurl/[>=7.64.1 <8.0.0]") | ||
| if self.options.build_deployment_admin: | ||
| self.requires("zlib/[>=1.2.8 <2.0.0]") | ||
| self.requires("zlib/[>=1.2.13 <2.0.0]") #Direct dep on zlib is needed to resolve a conflict with libcurl and libzip |
There was a problem hiding this comment.
In Conan 2.0, require-override should be done as the following:
self.requires("openssl/1.1.1t", override=True)Note that the above does not make openssl a requirement, just override upstream requirements.
This is explained here: https://docs.conan.io/2/tutorial/versioning/conflicts.html#resolving-conflicts
This PR removes the deployment admin bundle. This is task in #509.