@@ -3,6 +3,7 @@ package buildtools
33import (
44 "errors"
55 "fmt"
6+ conancommand "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/conan"
67 "os"
78 "os/exec"
89 "path/filepath"
@@ -1486,18 +1487,19 @@ func ConanCmd(c *cli.Context) error {
14861487 }
14871488
14881489 args := cliutils .ExtractCommand (c )
1489- cmdName , conanArgs := getCommandName (args )
14901490
1491- // Execute native conan command directly
1492- log .Info (fmt .Sprintf ("Running Conan %s." , cmdName ))
1493- conanCmd := exec .Command ("conan" , append ([]string {cmdName }, conanArgs ... )... )
1494- conanCmd .Stdout = os .Stdout
1495- conanCmd .Stderr = os .Stderr
1496- if err := conanCmd .Run (); err != nil {
1497- return fmt .Errorf ("conan %s failed: %w" , cmdName , err )
1491+ // Extract build flags (--build-name, --build-number) before passing to Conan
1492+ filteredArgs , buildConfiguration , err := build .ExtractBuildDetailsFromArgs (args )
1493+ if err != nil {
1494+ return err
14981495 }
14991496
1500- return nil
1497+ cmdName , conanArgs := getCommandName (filteredArgs )
1498+
1499+ // Use jfrog-cli-artifactory Conan command with build info support
1500+ conanCommand := conancommand .NewConanCommand ().SetCommandName (cmdName ).SetArgs (conanArgs ).SetBuildConfiguration (buildConfiguration )
1501+
1502+ return commands .Exec (conanCommand )
15011503}
15021504
15031505func pythonCmd (c * cli.Context , projectType project.ProjectType ) error {
0 commit comments