Skip to content
Closed
Show file tree
Hide file tree
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
20 changes: 11 additions & 9 deletions buildtools/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package buildtools
import (
"errors"
"fmt"
conancommand "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/conan"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -1486,18 +1487,19 @@ func ConanCmd(c *cli.Context) error {
}

args := cliutils.ExtractCommand(c)
cmdName, conanArgs := getCommandName(args)

// 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)
// Extract build flags (--build-name, --build-number) before passing to Conan
filteredArgs, buildConfiguration, err := build.ExtractBuildDetailsFromArgs(args)
if err != nil {
return err
}

return nil
cmdName, conanArgs := getCommandName(filteredArgs)

// Use jfrog-cli-artifactory Conan command with build info support
conanCommand := conancommand.NewConanCommand().SetCommandName(cmdName).SetArgs(conanArgs).SetBuildConfiguration(buildConfiguration)

return commands.Exec(conanCommand)
}

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