Fix merge cassettes parameters

GoogleCloudPlatform · Dec 4, 2024 · b03665f · b03665f
1 parent 238ef11
commit b03665f
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/.ci/magician/cmd/vcr_merge_eap.go b/.ci/magician/cmd/vcr_merge_eap.go
@@ -48,16 +48,7 @@ var vcrMergeEapCmd = &cobra.Command{
 
 func execVCRMergeEAP(gh GithubClient, clNumber, baseBranch string, runner source.Runner) error {
 	head := "auto-cl-" + clNumber
-	var branchPath string
-	if baseBranch != "main" {
-		branchPath = "/refs/heads/" + baseBranch
-	}
-	mergeCassettes(
-		"gs://ci-vcr-cassettes/private",
-		branchPath,
-		fmt.Sprintf("refs/heads/%s", head),
-		runner,
-	)
+	mergeCassettes("gs://ci-vcr-cassettes/private", baseBranch, fmt.Sprintf("refs/heads/%s", head), runner)
 	return nil
 }