Skip to content

refactor: Use environments to install Conan #10127

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor: Use environments to install Conan #10127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb8a2c
refactor(docker): Use environments to install Conan
heliocastro Apr 4, 2025
321ae2a
fix(conan): Adapt the Conan package manager to use the virtual enviro…
nnobelis Apr 10, 2025
6f90359
fix(conan)!: Use a Conan profile named `ort-default` instead of the d…
nnobelis Apr 10, 2025
76b591b
refactor(conan): Remove dummy profile settings
heliocastro Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions plugins/package-managers/conan/src/main/kotlin/Conan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@ class Conan(
private val config: ConanConfig
) : PackageManager("Conan") {
companion object {
internal val DUMMY_COMPILER_SETTINGS = arrayOf(
Copy link
Member

@sschuberth sschuberth Jun 6, 2025

Choose a reason for hiding this comment

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

I think it's fine (and even less confusing) to squash this to the previous commit, saying to replace hard-coded dummy compiler settings with proper ones. Otherwise there's an intermediate commit with both dummy and detected settings, which does not make sense.

"-s", "compiler=gcc",
"-s", "compiler.libcxx=libstdc++",
"-s", "compiler.version=11.1"
)

internal const val SCOPE_NAME_DEPENDENCIES = "requires"
internal const val SCOPE_NAME_DEV_DEPENDENCIES = "build_requires"
internal const val SCOPE_NAME_TEST_DEPENDENCIES = "test_requires"
Expand Down
2 changes: 0 additions & 2 deletions plugins/package-managers/conan/src/main/kotlin/ConanV1Handler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import org.ossreviewtoolkit.model.PackageReference
import org.ossreviewtoolkit.model.RemoteArtifact
import org.ossreviewtoolkit.model.Scope
import org.ossreviewtoolkit.model.VcsInfo
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
import org.ossreviewtoolkit.utils.common.Os
Expand Down Expand Up @@ -70,7 +69,6 @@ internal class ConanV1Handler(private val conan: Conan) : ConanVersionHandler {
definitionFile.name,
"--json",
jsonFile.absolutePath,
*DUMMY_COMPILER_SETTINGS,
"--profile",
"ort-default"
).requireSuccess()
Expand Down
3 changes: 0 additions & 3 deletions plugins/package-managers/conan/src/main/kotlin/ConanV2Handler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import org.ossreviewtoolkit.model.PackageReference
import org.ossreviewtoolkit.model.RemoteArtifact
import org.ossreviewtoolkit.model.Scope
import org.ossreviewtoolkit.model.VcsInfo
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_TEST_DEPENDENCIES
Expand Down Expand Up @@ -74,7 +73,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
jsonFile.absolutePath,
"--profile:all",
"ort-default",
*DUMMY_COMPILER_SETTINGS,
definitionFile.name
).requireSuccess()
} else {
Expand All @@ -88,7 +86,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
jsonFile.absolutePath,
"--profile:all",
"ort-default",
*DUMMY_COMPILER_SETTINGS,
definitionFile.name
).requireSuccess()
}
Expand Down
Loading