feat(bazel): Add Conan dependencies to Bazel's dependency tree #10126

nnobelis · 2025-04-03T14:31:51Z

Please have a look at the individual commit messages for the details.

plugins/package-managers/bazel/src/funTest/kotlin/BazelFunTest.kt

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

codecov · 2025-04-03T14:59:06Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.55%. Comparing base (de3a0c6) to head (f0c5148).
Report is 43 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #10126      +/-   ##
============================================
- Coverage     69.59%   69.55%   -0.04%     
  Complexity     1454     1454              
============================================
  Files           270      270              
  Lines          9670     9678       +8     
  Branches       1029     1033       +4     
============================================
+ Hits           6730     6732       +2     
- Misses         2488     2494       +6     
  Partials        452      452

Flag	Coverage Δ
funTest-docker	`68.80% <ø> (ø)`
funTest-non-docker	`33.32% <ø> (ø)`
test-ubuntu-24.04	`39.13% <ø> (ø)`
test-windows-2022	`39.11% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

plugins/package-managers/conan/src/main/kotlin/Conan.kt

plugins/package-managers/conan/src/main/kotlin/ConanV2Handler.kt

Signed-off-by: Nicolas Nobelis <[email protected]>

sschuberth

@mnonnenmacher I'd like you to also have a look.

plugins/package-managers/bazel/build.gradle.kts

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

sschuberth · 2025-04-07T10:07:44Z

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

+        val conanPackages = mutableSetOf<Package>()
+
+        conanExtension?.let { extension ->
+            val conanProjectReferences = mutableSetOf<PackageReference>()


How about moving this whole long block to a function for readability?

The problem is that resolveConanDependencies has a lot of parameters to carry on. Do you still think this would be worthwhile ?

I'd say it depends on the concrete number... if it's more than 7 parameters, then not, probably.

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

sschuberth · 2025-04-07T10:14:37Z

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

+     * Only scan Bazel dependencies and skip reporting Conan packages in the dependency tree.
+     */
+    @OrtPluginOption(defaultValue = "false")
+    val bazelDependenciesOnly: Boolean


Related to my comment on the previous commit, can't we archive the same by simply disabling Conan as a package manager? Or do you think there are use-cases where there are both Bazel and Conan projects in one repository, but they should be recognized independently?

This is a case with one of our customer: they have a repository with Bazel and Conan definition files + Conan packages in the Bazel project.

Additionally I created the bazelDependenciesOnly parameter because it also exist in Pub, so you can see it as some kind of alignment.

sschuberth · 2025-04-07T10:16:15Z

plugins/package-managers/conan/src/main/kotlin/Conan.kt

@@ -56,6 +56,7 @@ import org.ossreviewtoolkit.plugins.api.OrtPlugin
 import org.ossreviewtoolkit.plugins.api.OrtPluginOption
 import org.ossreviewtoolkit.plugins.api.PluginDescriptor
 import org.ossreviewtoolkit.utils.common.CommandLineTool
+import org.ossreviewtoolkit.utils.common.alsoIfNull


Esp. with this commit, I don't really see why one would need to disable the Bazel <-> Conan interaction.

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

...ers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-conan-dependencies.yml

plugins/package-managers/conan/src/main/kotlin/Conan.kt

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

Comments addressed.

mnonnenmacher

Looks good to me, but I don't know much about Bazel. @sschuberth I assume you would also be fine with merging this as you dismissed your review?

sschuberth · 2025-04-11T15:51:50Z

plugins/package-managers/bazel/src/main/kotlin/BazelModel.kt

+    val dependencies: List<BazelModule> = emptyList(),
+    val extensionUsages: List<BazelExtension> = emptyList()
+)
+@Serializable


Nit: Missing blank line before this one.

sschuberth · 2025-04-11T15:52:58Z

@sschuberth I assume you would also be fine with merging this as you dismissed your review?

I've dismissed my review as I current cannot spend the time to do yet another thorough review. I'm ok if you want to merge.

It is possible to use Conan dependencies with Bazel. This commit changes the Bazel package manager to list the Conan dependencies with the Conan package manager and complete the Bazel dependency tree with them. The `PackageManagerDependency` approach in Pub/Gradle package manager cannot be used here as the Conan packages have to be filtered in correlation with the 'bazel mod graph' output. The test project has been generated thanks to the documentation at [1]. In addition to the files present in the source repository, the other files were generated by `conan install . --build=missing`. This command requires Conan version 2 and is a prerequisite for having the Conan dependencies available to Bazel. Please note that this command generates the needed Bazel files and builds the Conan dependencies. Consequently, it cannot be run by ORT: it is the responsibility of the repository owner to add the generated *.bazel and *.bzl files to the repository. There is a documentation at [2] about making Conan 1 work with Bazel, however the resulting project does not use `bzlmod` on which ORT relies. [1]: https://docs.conan.io/2/examples/tools/google/bazeltoolchain/build_simple_bazel_7x_project.html#examples-tools-bazel-7x-toolchain-build-simple-bazel-project [2]: https://docs.conan.io/1/integrations/build_system/bazel.html Signed-off-by: Nicolas Nobelis <[email protected]>

Signed-off-by: Nicolas Nobelis <[email protected]>

If a Bazel project uses some Conan packages, the corresponding Conan files should not be picked up by the Conan package manager. Therefore, the Conan file is checked to NOT contain the BazelDeps and BazelToolchain generators. Signed-off-by: Nicolas Nobelis <[email protected]>

github-advanced-security bot found potential problems Apr 3, 2025

View reviewed changes

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch 2 times, most recently from 4d1e0a4 to f3c982a Compare April 3, 2025 14:42

github-advanced-security bot found potential problems Apr 3, 2025

View reviewed changes

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt Fixed Show fixed Hide fixed

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch 2 times, most recently from 8d18240 to 1f5e04c Compare April 4, 2025 14:54

nnobelis marked this pull request as ready for review April 4, 2025 15:43

nnobelis requested a review from a team as a code owner April 4, 2025 15:43

sschuberth requested changes Apr 4, 2025

View reviewed changes

plugins/package-managers/conan/src/main/kotlin/Conan.kt Outdated Show resolved Hide resolved

plugins/package-managers/conan/src/main/kotlin/ConanV2Handler.kt Outdated Show resolved Hide resolved

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from 1f5e04c to adec183 Compare April 7, 2025 07:54

nnobelis requested a review from sschuberth April 7, 2025 07:55

This comment was marked as resolved.

Sign in to view

feat(conan): Add support for test dependencies with Conan 2

464a8e9

Signed-off-by: Nicolas Nobelis <[email protected]>

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from adec183 to 8719ccf Compare April 7, 2025 09:02

sschuberth previously requested changes Apr 7, 2025

View reviewed changes

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from 8719ccf to 146a501 Compare April 7, 2025 12:28

sschuberth requested a review from mnonnenmacher April 7, 2025 12:30

sschuberth mentioned this pull request Apr 8, 2025

Support external package managers for Bazel (like Conan, Maven, Pip, ...) #8451

Open

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from 146a501 to 9a85c6e Compare April 9, 2025 12:03

nnobelis requested a review from sschuberth April 9, 2025 12:04

sschuberth requested a review from MarcelBochtler April 9, 2025 12:34

mnonnenmacher requested changes Apr 11, 2025

View reviewed changes

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch 2 times, most recently from a93baa6 to b55755a Compare April 11, 2025 09:32

nnobelis requested a review from mnonnenmacher April 11, 2025 09:32

sschuberth reviewed Apr 11, 2025

View reviewed changes

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt Outdated Show resolved Hide resolved

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from b55755a to 8f426e7 Compare April 11, 2025 11:10

nnobelis requested a review from sschuberth April 11, 2025 11:10

mnonnenmacher previously approved these changes Apr 11, 2025

View reviewed changes

sschuberth reviewed Apr 11, 2025

View reviewed changes

nnobelis added 3 commits April 11, 2025 22:40

feat(bazel): Add a config flag to disable the analysis of Conan packages

41352c8

Signed-off-by: Nicolas Nobelis <[email protected]>

nnobelis dismissed mnonnenmacher’s stale review via f0c5148 April 11, 2025 20:40

nnobelis force-pushed the nnobelis/bazel_conan_dependencies branch from 8f426e7 to f0c5148 Compare April 11, 2025 20:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(bazel): Add Conan dependencies to Bazel's dependency tree #10126

feat(bazel): Add Conan dependencies to Bazel's dependency tree #10126

nnobelis commented Apr 3, 2025

codecov bot commented Apr 3, 2025 •

edited

Loading

This comment was marked as resolved.

sschuberth left a comment

sschuberth Apr 7, 2025

nnobelis Apr 7, 2025

sschuberth Apr 7, 2025

sschuberth Apr 7, 2025

nnobelis Apr 7, 2025

sschuberth Apr 7, 2025

mnonnenmacher left a comment

sschuberth Apr 11, 2025

sschuberth commented Apr 11, 2025

feat(bazel): Add Conan dependencies to Bazel's dependency tree #10126

Are you sure you want to change the base?

feat(bazel): Add Conan dependencies to Bazel's dependency tree #10126

Conversation

nnobelis commented Apr 3, 2025

codecov bot commented Apr 3, 2025 • edited Loading

Codecov Report

This comment was marked as resolved.

sschuberth left a comment

Choose a reason for hiding this comment

sschuberth Apr 7, 2025

Choose a reason for hiding this comment

nnobelis Apr 7, 2025

Choose a reason for hiding this comment

sschuberth Apr 7, 2025

Choose a reason for hiding this comment

sschuberth Apr 7, 2025

Choose a reason for hiding this comment

nnobelis Apr 7, 2025

Choose a reason for hiding this comment

sschuberth Apr 7, 2025

Choose a reason for hiding this comment

mnonnenmacher left a comment

Choose a reason for hiding this comment

sschuberth Apr 11, 2025

Choose a reason for hiding this comment

sschuberth commented Apr 11, 2025

codecov bot commented Apr 3, 2025 •

edited

Loading