add workflow to correct branch

Author: skssmd

.goreleaser.yaml

@@ -197,7 +197,7 @@ winget:
       owner: skssmd                    # ← CHANGED: Your fork, not microsoft
       name: winget-pkgs
       branch: "{{.ProjectName}}-{{.Version}}-{{.ShortCommit}}"
-      token: "{{ .Env.GITHUB_TOKEN }}"
+      token: "{{ .Env.WINGET_GITHUB_TOKEN }}"
       pull_request:
         enabled: true
         draft: false

cmd/graft/main.go

@@ -21,7 +21,7 @@ func main() {
 	if len(args) > 0 {
 		arg := args[0]
 		if arg == "-v" || arg == "--version" {
-			fmt.Println("v2.3.1")
+			fmt.Println("v2.3.2")
 			return
 		}
 		if arg == "--help" {

internal/deploy/project.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/skssmd/graft/internal/config"
+	"github.com/skssmd/graft/internal/git"
 	"gopkg.in/yaml.v3"
 )
 
@@ -374,6 +375,35 @@ func GenerateWorkflows(p *Project,env string, remoteURL string, mode string, web
 		gitBranch = meta.GitBranch
 	}
 
+	// Branch management: Switch to the target branch if necessary
+	originalBranch, _ := git.GetCurrentBranch(".")
+	switchedBranch := false
+	if gitBranch != "" && originalBranch != gitBranch {
+		dirty, _ := git.IsDirty(".")
+		if dirty {
+			fmt.Printf("⚠️  Warning: Repository is dirty. Cannot switch to branch '%s' for workflow generation. Files will be placed in '%s'.\n", gitBranch, originalBranch)
+		} else {
+			exists, _ := git.BranchExists(".", gitBranch)
+			if exists {
+				fmt.Printf("🌿 Switching to branch '%s' to place workflows...\n", gitBranch)
+				if err := git.CheckoutBranch(".", gitBranch); err == nil {
+					switchedBranch = true
+					defer func() {
+						if switchedBranch {
+							fmt.Printf("🌿 Switching back to original branch '%s'...\n", originalBranch)
+							git.CheckoutBranch(".", originalBranch)
+						}
+					}()
+				} else {
+					fmt.Printf("⚠️  Warning: Failed to switch to branch '%s': %v\n", gitBranch, err)
+				}
+			} else {
+				fmt.Printf("⚠️  Warning: Target branch '%s' does not exist. Files will be placed in '%s'.\n", gitBranch, originalBranch)
+			}
+		}
+	}
+
+
 	// Extract owner and repo from remote URL
 	ownerRepo := ""
 	if strings.HasPrefix(remoteURL, "https://") {
@@ -405,11 +435,8 @@ func GenerateWorkflows(p *Project,env string, remoteURL string, mode string, web
       - completed`
 			condition = "if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}"
 		} else {
-			// Use the selected branch for push triggers
+			// Use ONLY the configured branch for push triggers
 			triggerBranches := "[ " + gitBranch + " ]"
-			if gitBranch == "main" || gitBranch == "master" || gitBranch == "develop" {
-				triggerBranches = "[ main, develop ]"
-			}
 
 			triggers = fmt.Sprintf(`  push:
     branches: %s`, triggerBranches)
@@ -471,13 +498,9 @@ jobs:
 		}
 	}
 
-	// 2. Generate CI Workflow (only for git-images)
 	if mode == "git-images" {
-		// Use the selected branch for push triggers
+		// Use ONLY the configured branch for push triggers
 		triggerBranches := "[ " + gitBranch + " ]"
-		if gitBranch == "main" || gitBranch == "master" || gitBranch == "develop" {
-			triggerBranches = "[ main, develop ]"
-		}
 
 		ciTemplate := fmt.Sprintf("name: CI/CD Pipeline ("+env+")\n\n"+`on:
   push:

internal/git/git.go

@@ -60,6 +60,44 @@ func GetLatestCommit(dir, branch string) (string, error) {
 	return strings.TrimSpace(string(output)), nil
 }
 
+// IsDirty checks if there are any uncommitted changes in the repository
+func IsDirty(dir string) (bool, error) {
+	cmd := exec.Command("git", "status", "--porcelain")
+	cmd.Dir = dir
+	output, err := cmd.Output()
+	if err != nil {
+		return false, fmt.Errorf("failed to check git status: %v", err)
+	}
+	return len(strings.TrimSpace(string(output))) > 0, nil
+}
+
+// BranchExists checks if a branch exists locally
+func BranchExists(dir, branch string) (bool, error) {
+	cmd := exec.Command("git", "show-ref", "--verify", "--quiet", "refs/heads/"+branch)
+	cmd.Dir = dir
+	err := cmd.Run()
+	if err == nil {
+		return true, nil
+	}
+
+	// Also check remotes
+	cmd = exec.Command("git", "show-ref", "--verify", "--quiet", "refs/remotes/origin/"+branch)
+	cmd.Dir = dir
+	err = cmd.Run()
+	return err == nil, nil
+}
+
+// CheckoutBranch switches to the specified branch
+func CheckoutBranch(dir, branch string) error {
+	cmd := exec.Command("git", "checkout", branch)
+	cmd.Dir = dir
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("failed to checkout branch %s: %v\nOutput: %s", branch, err, string(output))
+	}
+	return nil
+}
+
 // CreateArchive exports a git commit to a tarball, optionally filtering to specific paths
 // paths: optional list of paths to include (e.g., ["frontend/"] for service filtering)
 func CreateArchive(dir, commit, outputPath string, paths []string) error {