Fallback when not in CI

vercel · May 11, 2023 · 2b40f9b · 2b40f9b
1 parent 58b4d0c
commit 2b40f9b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/cli/internal/runsummary/run_summary.go b/cli/internal/runsummary/run_summary.go
@@ -14,6 +14,7 @@ import (
 	"github.com/vercel/turbo/cli/internal/ci"
 	"github.com/vercel/turbo/cli/internal/client"
 	"github.com/vercel/turbo/cli/internal/env"
+	"github.com/vercel/turbo/cli/internal/scm"
 	"github.com/vercel/turbo/cli/internal/spinner"
 	"github.com/vercel/turbo/cli/internal/turbopath"
 	"github.com/vercel/turbo/cli/internal/util"
@@ -116,7 +117,7 @@ func NewRunSummary(
 			Tasks:              []*TaskSummary{},
 			GlobalHashSummary:  globalHashSummary,
 			SCM:                getSCMState(envVars, repoRoot),
-			User:               getUser(envVars),
+			User:               getUser(envVars, repoRoot),
 		},
 		ui:                 ui,
 		runType:            runType,
@@ -335,13 +336,17 @@ func (rsm *Meta) postTaskSummaries(runID string) []error {
 	return nil
 }
 
-func getUser(envVars env.EnvironmentVariableMap) string {
+func getUser(envVars env.EnvironmentVariableMap, dir turbopath.AbsoluteSystemPath) string {
 	var username string
 
 	if ci.IsCi() {
 		vendor := ci.Info()
 		username = envVars[vendor.UsernameEnvVar]
 	}
 
+	if username == "" {
+		username = scm.GetCurrentUser(dir)
+	}
+
 	return username
 }
diff --git a/cli/internal/scm/scm.go b/cli/internal/scm/scm.go
@@ -78,3 +78,17 @@ func GetCurrentSha(dir turbopath.AbsoluteSystemPath) string {
 	}
 	return strings.TrimRight(string(out), "\n")
 }
+
+// GetCurrentUser returns the local user.name
+// We do not specify a --local or --global flag so it should
+// resolve the value the same way git does when creating a commit.
+func GetCurrentUser(dir turbopath.AbsoluteSystemPath) string {
+	cmd := exec.Command("git", []string{"config", "user.name"}...)
+	cmd.Dir = dir.ToString()
+
+	out, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+	return strings.TrimRight(string(out), "\n")
+}