Fix TAG writing in env file (#565)

cody-wang-cb · web-flow · commit 00569b5c78ee · 2025-10-03T11:42:37.000-04:00
diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go
@@ -143,7 +143,7 @@ func createCommitMessage(updatedDependencies []VersionUpdateInfo, repoPath strin
 	}
 	commitDescription = strings.TrimSuffix(commitDescription, " ")
 	commitTitle += strings.Join(repos, ", ")
-	
+
 	if githubAction {
 		err := writeToGithubOutput(commitTitle, commitDescription, repoPath)
 		if err != nil {
@@ -264,8 +264,6 @@ func getVersionAndCommit(ctx context.Context, client *github.Client, dependencie
 				diff,
 			}
 		}
-		// For branch tracking, return branch name as the tag
-		return dependencies[dependencyType].Branch, commit, updatedDependency, nil
 	}
 
 	if version != nil {
@@ -314,6 +312,10 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error {
 
 		dependencyPrefix := strings.ToUpper(dependency)
 
+		if dependencies[dependency].Tracking == "branch" {
+			dependencies[dependency].Tag = dependencies[dependency].Branch
+		}
+
 		envLines = append(envLines, fmt.Sprintf("export %s_%s=%s",
 			dependencyPrefix, "TAG", dependencies[dependency].Tag))
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func createCommitMessage(updatedDependencies []VersionUpdateInfo, repoPath strin`
`143`	`143`	`}`
`144`	`144`	`commitDescription = strings.TrimSuffix(commitDescription, " ")`
`145`	`145`	`commitTitle += strings.Join(repos, ", ")`
`146`		`-`
	`146`	`+`
`147`	`147`	`if githubAction {`
`148`	`148`	`err := writeToGithubOutput(commitTitle, commitDescription, repoPath)`
`149`	`149`	`if err != nil {`
`@@ -264,8 +264,6 @@ func getVersionAndCommit(ctx context.Context, client *github.Client, dependencie`
`264`	`264`	`diff,`
`265`	`265`	`}`
`266`	`266`	`}`
`267`		`- // For branch tracking, return branch name as the tag`
`268`		`- return dependencies[dependencyType].Branch, commit, updatedDependency, nil`
`269`	`267`	`}`
`270`	`268`
`271`	`269`	`if version != nil {`
`@@ -314,6 +312,10 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error {`
`314`	`312`
`315`	`313`	`dependencyPrefix := strings.ToUpper(dependency)`
`316`	`314`
	`315`	`+ if dependencies[dependency].Tracking == "branch" {`
	`316`	`+ dependencies[dependency].Tag = dependencies[dependency].Branch`
	`317`	`+ }`
	`318`	`+`
`317`	`319`	`envLines = append(envLines, fmt.Sprintf("export %s_%s=%s",`
`318`	`320`	`dependencyPrefix, "TAG", dependencies[dependency].Tag))`
`319`	`321`