Skip to content
Closed
Changes from all commits
Commits
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
22 changes: 13 additions & 9 deletions buildtools/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"github.com/jfrog/jfrog-cli/docs/buildtools/rubyconfig"
setupdocs "github.com/jfrog/jfrog-cli/docs/buildtools/setup"

conancommand "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/conan"

Check failure on line 24 in buildtools/cli.go

View workflow job for this annotation

GitHub Actions / Lint

no required module provides package github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/conan; to add it:
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container"
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet"
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang"
Expand Down Expand Up @@ -1486,18 +1487,21 @@
}

args := cliutils.ExtractCommand(c)
cmdName, conanArgs := getCommandName(args)
filteredArgs, buildConfiguration, err := build.ExtractBuildDetailsFromArgs(args)
if err != nil {
return err
}
cmdName, conanArgs := getCommandName(filteredArgs)

// Execute native conan command directly
log.Info(fmt.Sprintf("Running Conan %s.", cmdName))
conanCmd := exec.Command("conan", append([]string{cmdName}, conanArgs...)...)
conanCmd.Stdout = os.Stdout
conanCmd.Stderr = os.Stderr
if err := conanCmd.Run(); err != nil {
return fmt.Errorf("conan %s failed: %w", cmdName, err)
// Create and configure Conan command
conanCmd := conancommand.NewConanCommand()
conanCmd.SetCommandName(cmdName).SetArgs(conanArgs)

if buildConfiguration != nil {
conanCmd.SetBuildConfiguration(buildConfiguration)
}

return nil
return conanCmd.Run()
}

func pythonCmd(c *cli.Context, projectType project.ProjectType) error {
Expand Down
Loading