Fix bitrise support for golang packages (#6)

drone · Jan 12, 2023 · d2ef70b · d2ef70b
1 parent 152baae
commit d2ef70b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/plugin/bitrise/execer.go b/plugin/bitrise/execer.go
@@ -72,9 +72,13 @@ func (e *Execer) Exec(ctx context.Context) error {
 		}
 	}
 
+	module := out.Toolkit.Go.Module
+	if module == "" {
+		module = out.Toolkit.Go.PackageName
+	}
 	// execute the plugin. the execution logic differs
 	// based on programming language.
-	if module := out.Toolkit.Go.Module; module != "" {
+	if module != "" {
 		// if the plugin is a Go module
 
 		slog.FromContext(ctx).

diff --git a/plugin/bitrise/parse.go b/plugin/bitrise/parse.go
@@ -21,6 +21,7 @@ func parse(b []byte) (*spec, error) {
 	// other default entrypoint or module are
 	// provided.
 	if out.Toolkit.Go.Module == "" &&
+		out.Toolkit.Go.PackageName == "" &&
 		out.Toolkit.Bash.Entryfile == "" {
 		out.Toolkit.Bash.Entryfile = "step.sh"
 	}

diff --git a/plugin/bitrise/types.go b/plugin/bitrise/types.go
@@ -19,7 +19,8 @@ type spec struct {
 			Entryfile string `yaml:"entry_file"`
 		}
 		Go struct {
-			Module string
+			Module      string
+			PackageName string `yaml:"package_name"`
 		}
 	}
 }