making branches optional

CyrexEnterprise · May 29, 2020 · acf9159 · acf9159
1 parent e2a9463
commit acf9159
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 .idea
-.bin
+.bin
+test.sh
diff --git a/cmd/envgen.go b/cmd/envgen.go
@@ -129,25 +129,22 @@ func (g *Generator) loadConfig(filepath string) error {
 
 	g.conf = *config
 
-	g.branchSuffix, err = g.findBranchSuffix()
-	if err != nil {
-		return fmt.Errorf("missing branch suffix")
-	}
+	g.branchSuffix = g.findBranchSuffix()
 
 	return nil
 }
 
 // findBranchSuffix determines the branch suffix to use, depending on the current CI branch
-func (g *Generator) findBranchSuffix() (string, error) {
+func (g *Generator) findBranchSuffix() string {
 	branch := getEnv(g.conf.BranchVarName, "", g.conf.BranchVarDefault)
 
 	for _, b := range g.conf.Branches {
 		if b.Name == branch {
-			return b.Suffix, nil
+			return b.Suffix
 		}
 	}
 
-	return "", fmt.Errorf("could not find branch suffix")
+	return ""
 }
 
 // getEnv looks up for a loaded environment variable.