Merge pull request #291 from lets-cli/fix-go-build-command

Fix go build commands

Author: kindermax

.gitignore

@@ -20,7 +20,7 @@
 dist
 
 # lets binary
-lets
+/lets
 lets-dev
 .lets
 lets.my.yaml

.goreleaser.yml

@@ -10,7 +10,7 @@ release:
 
 builds:
   - id: darwin-amd64
-    main: .
+    main: ./cmd/lets
     goos:
       - darwin
     goarch:
@@ -23,9 +23,9 @@ builds:
     flags:
       - -mod=readonly
     ldflags:
-      - -s -w -X main.version={{.Version}}
+      - -s -w -X main.Version={{.Version}}
   - id: darwin-arm64
-    main: .
+    main: ./cmd/lets
     goos:
       - darwin
     goarch:
@@ -38,9 +38,9 @@ builds:
     flags:
       - -mod=readonly
     ldflags:
-      - -s -w -X main.version={{.Version}}
+      - -s -w -X main.Version={{.Version}}
   - id: linux-amd64
-    main: .
+    main: ./cmd/lets
     goos:
       - linux
     goarch:
@@ -51,7 +51,7 @@ builds:
     flags:
       - -mod=readonly
     ldflags:
-      - -s -w -X main.version={{.Version}}
+      - -s -w -X main.Version={{.Version}}
 
 archives:
 - formats: [tar.gz]

.run/lets --version.run.xml

@@ -1,23 +1,23 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Package",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${fileDirname}"
-        },
-        {
-            "name": "Run",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceRoot}",
-            "args": []
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Package",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${fileDirname}"
+    },
+    {
+      "name": "Run",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceRoot}/cmd/lets/main.go",
+      "args": []
+    }
+  ]
+}

.run/lets print-env.run.xml

@@ -20,7 +20,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var version = "0.0.0-dev"
+var Version = "0.0.0-dev"
 
 func main() {
 	ctx := getContext()
@@ -29,11 +29,11 @@ func main() {
 
 	logging.InitLogging(os.Stdout, os.Stderr)
 
-	rootCmd := cmd.CreateRootCommand(version)
+	rootCmd := cmd.CreateRootCommand(Version)
 	rootCmd.InitDefaultHelpFlag()
 	rootCmd.InitDefaultVersionFlag()
 	reinitCompletionCmd := cmd.InitCompletionCmd(rootCmd, nil)
-	cmd.InitSelfCmd(rootCmd, version)
+	cmd.InitSelfCmd(rootCmd, Version)
 	rootCmd.InitDefaultHelpCmd()
 
 	command, args, err := rootCmd.Traverse(os.Args[1:])
@@ -66,7 +66,7 @@ func main() {
 		rootFlags.config = os.Getenv("LETS_CONFIG")
 	}
 
-	cfg, err := config.Load(rootFlags.config, configDir, version)
+	cfg, err := config.Load(rootFlags.config, configDir, Version)
 	if err != nil {
 		if failOnConfigError(rootCmd, command, rootFlags) {
 			log.Errorf("lets: config error: %s", err)
@@ -82,7 +82,7 @@ func main() {
 	if rootFlags.init {
 		wd, err := os.Getwd()
 		if err == nil {
-			err = workdir.InitLetsFile(wd, version)
+			err = workdir.InitLetsFile(wd, Version)
 		}
 
 		if err != nil {
@@ -94,7 +94,7 @@ func main() {
 	}
 
 	if rootFlags.upgrade {
-		upgrader, err := upgrade.NewBinaryUpgrader(registry.NewGithubRegistry(ctx), version)
+		upgrader, err := upgrade.NewBinaryUpgrader(registry.NewGithubRegistry(ctx), Version)
 		if err == nil {
 			err = upgrader.Upgrade()
 		}

.run/lets.run.xml

@@ -31,7 +31,8 @@ services:
       - bash
       - -c
       - |
-        go build -o /usr/bin/lets *.go
+        go build -buildvcs=false -o /usr/bin/lets ./cmd/lets
+        ls -l /usr/bin/lets
         if [[ -n "${LETSOPT_TEST}" ]]; then
           bats tests/"${LETSOPT_TEST}" ${LETSOPT_OPTS}
         else

.vscode/launch.json

@@ -9,3 +9,7 @@ commands:
   build-lint-image:
     description: Build lets lint docker image
     cmd: docker build -t lets-lint -f Dockerfile --target linter .
+
+  goreleaser-dev:
+    description: Run goreleaser to test its build
+    cmd: goreleaser build --skip=validate --clean

main.go cmd/lets/main.gomain.go renamed to cmd/lets/main.go

@@ -109,9 +109,9 @@ commands:
         PATH2LETSDEV=$LETSOPT_PATH
       fi
 
-      go build -ldflags="-X main.version=${VERSION:1}-dev" -o "${BIN}" *.go && \
+      go build -ldflags="-X main.Version=${VERSION:1}-dev" -o "${BIN}" ./cmd/lets && \
       sudo mv ./${BIN} $PATH2LETSDEV/${BIN} && \
-      echo " - binary ${BIN} version ${VERSION} successfully installed in ${PATH2LETSDEV}"
+      echo " - binary ${BIN} version $($PATH2LETSDEV/${BIN} --version) successfully installed in ${PATH2LETSDEV}"
 
   build:
     description: Build lets from source code
@@ -120,9 +120,18 @@ commands:
     cmd: |
       VERSION=$(git describe)
       BIN=${LETSOPT_BIN:-lets}
-
-      go build -ldflags="-X main.version=${VERSION:1}-dev" -o ${BIN} *.go && \
-      echo " - binary './${BIN}' (version ${VERSION}) successfully build"
+      
+      go build \
+        -ldflags="-X main.Version=${VERSION:1}-dev" \
+        -o ${BIN} ./cmd/lets
+      
+      success=$?
+      if [[ $success -eq 0 ]]; then
+        version=$(./${BIN} --version)
+        echo " - binary './${BIN}' ($version) successfully build"
+      else
+        echo "Failed to build"
+      fi
 
   publish-docs:
     work_dir: docs