Fix build dependencies.

Author: lexbritvin

pkg/plugins/builder/builder.go

@@ -99,10 +99,11 @@ func (b *Builder) Build(ctx context.Context) error {
 			_ = b.Close()
 		}
 	}()
-	log.Printf("[INFO] Temporary folder: %s", b.env.wd)
+	log.Printf("[DEBUG] Temporary folder: %s", b.env.wd)
 
 	// Write files to dir and generate go mod.
 	log.Printf("[INFO] Creating project files and fetching dependencies")
+	b.env.SetEnv("CGO_ENABLE", "0")
 	err = b.env.CreateModFile(ctx, b.BuildOptions)
 	if err != nil {
 		return err
@@ -112,7 +113,7 @@ func (b *Builder) Build(ctx context.Context) error {
 	buildVer := b.getBuildVersion(b.LaunchrVersion)
 	for _, p := range b.Plugins {
 		if p.Version == "" {
-			p.Version = b.env.getPkgVersion(p.Package)
+			p.Version = b.env.GetPkgVersion(p.Package)
 		}
 	}
 
@@ -202,7 +203,7 @@ func (b *Builder) getBuildVersion(version *launchr.AppVersion) *launchr.AppVersi
 	bv.Name = b.PkgName
 
 	// Get version from the fetched go.mod module
-	bv.Version = b.env.getPkgVersion(b.CorePkg.Package)
+	bv.Version = b.env.GetPkgVersion(b.CorePkg.Package)
 
 	bv.OS = os.Getenv("GOOS")
 	bv.Arch = os.Getenv("GOARCH")

pkg/plugins/builder/environment.go

@@ -20,7 +20,9 @@ func envFromOs() envVars {
 	osenv := os.Environ()
 	env := make(envVars, 0, 8)
 	for _, v := range osenv {
-		if strings.HasPrefix(v, "GO") || strings.HasPrefix(v, "HOME=") {
+		if strings.HasPrefix(v, "GO") ||
+			strings.HasPrefix(v, "HOME=") ||
+			strings.HasPrefix(v, "PATH=") {
 			env = append(env, v)
 		}
 	}
@@ -201,7 +203,7 @@ func (env *buildEnvironment) parseGoMod() error {
 	return nil
 }
 
-func (env *buildEnvironment) getPkgVersion(pkg string) string {
+func (env *buildEnvironment) GetPkgVersion(pkg string) string {
 	var vrep *modfile.Replace
 	for _, rep := range env.gomod.Replace {
 		if strings.HasPrefix(pkg, rep.Old.Path) {
@@ -223,3 +225,7 @@ func (env *buildEnvironment) getPkgVersion(pkg string) string {
 	}
 	return v
 }
+
+func (env *buildEnvironment) SetEnv(k string, v string) {
+	env.env.Set(k, v)
+}

pkg/plugins/builder/plugin.go

@@ -39,26 +39,34 @@ func (p *Plugin) InitApp(*launchr.App) error {
 func (p *Plugin) CobraAddCommands(rootCmd *cobra.Command) error {
 	// Flag options.
 	var (
-		name    string
-		out     string
-		timeout int
-		plugins []string
-		replace []string
-		debug   bool
+		name       string
+		out        string
+		timeoutStr string
+		plugins    []string
+		replace    []string
+		debug      bool
 	)
 
 	var buildCmd = &cobra.Command{
 		Use: "build",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Don't show usage help on a runtime error.
 			cmd.SilenceUsage = true
+
+			// Set build timeout.
 			ctx := cmd.Context()
+			timeout, err := time.ParseDuration(timeoutStr)
+			if err != nil {
+				return err
+			}
 			if timeout != 0 {
 				// Execute build.
 				var cancel context.CancelFunc
-				ctx, cancel = context.WithTimeout(ctx, time.Second*time.Duration(timeout))
+				ctx, cancel = context.WithTimeout(ctx, timeout)
 				defer cancel()
 			}
+
+			// Parse dependencies definition.
 			allplugs, err := parsePlugins(plugins)
 			if err != nil {
 				return err
@@ -68,6 +76,7 @@ func (p *Plugin) CobraAddCommands(rootCmd *cobra.Command) error {
 				return err
 			}
 
+			// Set output path if it's not defined.
 			if len(out) == 0 && len(name) > 0 {
 				out = "./" + name
 			}
@@ -85,9 +94,10 @@ func (p *Plugin) CobraAddCommands(rootCmd *cobra.Command) error {
 			return Execute(ctx, opts)
 		},
 	}
+	// Command flags.
 	buildCmd.Flags().StringVarP(&name, "name", "n", "launchr", `Result application name`)
 	buildCmd.Flags().StringVarP(&out, "output", "o", "", `Build output file, by default application name is used`)
-	buildCmd.Flags().IntVarP(&timeout, "timeout", "t", 120, `Build timeout in seconds`)
+	buildCmd.Flags().StringVarP(&timeoutStr, "timeout", "t", "120s", `Build timeout duration, example: 0, 100ms, 1h23m`)
 	buildCmd.Flags().StringSliceVarP(&plugins, "plugin", "p", nil, `Include PLUGIN into the build with an optional version`)
 	buildCmd.Flags().StringSliceVarP(&replace, "replace", "r", nil, `Replace go dependency, see "go mod edit -replace"`)
 	buildCmd.Flags().BoolVarP(&debug, "debug", "d", false, `Include debug flags into the build to support go debugging with "delve". If not specified, debugging info is trimmed`)