populate branch name during template resolution (#1054)

sourcegraph · Jan 1, 2024 · 0621a63 · 0621a63
1 parent d53e95f
commit 0621a63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/batches/executor/run_steps.go b/internal/batches/executor/run_steps.go
@@ -141,8 +141,12 @@ func RunSteps(ctx context.Context, opts *RunStepsOpts) (stepResults []execution.
 
 		stepContext := template.StepContext{
 			BatchChange: *opts.Task.BatchChangeAttributes,
-			Repository:  util.NewTemplatingRepo(opts.Task.Repository.Name, opts.Task.Repository.FileMatches),
-			Outputs:     lastOutputs,
+			Repository: util.NewTemplatingRepo(
+				opts.Task.Repository.Name,
+				opts.Task.Repository.Branch.Name,
+				opts.Task.Repository.FileMatches,
+			),
+			Outputs: lastOutputs,
 			Steps: template.StepsContext{
 				Path:    opts.Task.Path,
 				Changes: previousStepResult.ChangedFiles,

diff --git a/internal/batches/util/repo.go b/internal/batches/util/repo.go
@@ -10,13 +10,14 @@ import (
 
 // NewTemplatingRepo transforms a given *graphql.Repository into a
 // template.Repository.
-func NewTemplatingRepo(repoName string, fileMatches map[string]bool) template.Repository {
+func NewTemplatingRepo(repoName string, branch string, fileMatches map[string]bool) template.Repository {
 	matches := make([]string, 0, len(fileMatches))
 	for path := range fileMatches {
 		matches = append(matches, path)
 	}
 	return template.Repository{
 		Name:        repoName,
+		Branch:      branch,
 		FileMatches: matches,
 	}
 }