Gitflow update

.github/workflows/ci.yml

@@ -58,11 +58,6 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/login-action@v1
-        with:
-          registry: registry.gitlab.com
-          username: ${{ secrets.GITLAB_USER }}
-          password: ${{ secrets.GITLAB_TOKEN }}
       - run: ./scripts/release || exit 0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1,26 @@
-.envrc
-test/.npmrc
+### Go template
+# Binaries for programs and plugins
+*.exe
+*.dll
+*.so
+*.dylib
+bin/
+semantic-release
+
+# Make sure we don't exclude directories with that name
+!semantic-release/
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
+.glide/
+
+# IDE Files
 .idea/
+main
+.version
+.ghr

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Dry-run against test repo",
+			"type": "go",
+			"request": "launch",
+			"mode": "debug",
+			"program": "${workspaceFolder}/cmd/semantic-release",
+			"args": [
+				"-vf",
+				"-dry",
+				"-slug",
+				"mgabeler-lee-6rs/semrel-test",
+				"-noci",
+				"-flow"
+			],
+			"env": {
+				"GITHUB_TOKEN": "${input:ghtok}",
+			},
+			"cwd": "/tmp/semrel-test",
+		},
+	],
+	"inputs": [
+		{
+			"id": "ghtok",
+			"password": true,
+			"description": "GitHub PAT",
+			"type": "promptString",
+		},
+	],
+}

cmd/semantic-release/main.go

@@ -11,12 +11,14 @@ import (
 	"syscall"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/go-git/go-git/v5"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/config"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/generator"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/hooks"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/plugin/manager"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/provider"
 	"github.com/go-semantic-release/semantic-release/v2/pkg/semrel"
+	"github.com/iancoleman/strcase"
 	"github.com/spf13/cobra"
 )
 
@@ -41,6 +43,30 @@ func errorHandler(logger *log.Logger) func(error, ...int) {
 	}
 }
 
+type CommitInfo struct {
+	Branch string
+	SHA    string
+}
+
+func GetCurCommitInfo() (*CommitInfo, error) {
+
+	repo, err := git.PlainOpen(".")
+	if err != nil {
+		return nil, err
+	}
+
+	headRef, err := repo.Head()
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &CommitInfo{
+		Branch: headRef.Name().Short(),
+		SHA:    headRef.Hash().String(),
+	}, nil
+}
+
 func main() {
 	cmd := &cobra.Command{
 		Use:     "semantic-release",
@@ -119,19 +145,57 @@ func cliHandler(cmd *cobra.Command, args []string) {
 		logger.Println("repo is private")
 	}
 
+	defaultBranch := ""
+
+	if conf.DefaultBranch != "" {
+		logger.Println("using overridden default branch:", conf.DefaultBranch, "instead of detected:", repoInfo.DefaultBranch)
+		defaultBranch = conf.DefaultBranch
+	} else {
+		defaultBranch = repoInfo.DefaultBranch
+		logger.Println("found default branch: " + defaultBranch)
+	}
+
 	currentBranch := ci.GetCurrentBranch()
 	if currentBranch == "" {
 		exitIfError(fmt.Errorf("current branch not found"))
 	}
 	logger.Println("found current branch: " + currentBranch)
 
-	if !conf.AllowMaintainedVersionOnDefaultBranch && conf.MaintainedVersion != "" && currentBranch == repoInfo.DefaultBranch {
+	curCommitInfo, err := GetCurCommitInfo()
+	if err == git.ErrRepositoryNotExists {
+		logger.Println(`Repository (.git directory) does not exist in local directory. Be sure to
+run go-semantic-release in a git repository`)
+	}
+	exitIfError(err)
+	logger.Println("found current branch: " + curCommitInfo.Branch)
+
+	prerelease := ""
+	if conf.Flow && conf.MaintainedVersion == "" && currentBranch != defaultBranch {
+		switch curCommitInfo.Branch {
+		// If branch is master -> no pre-latestRelease version
+		case "master":
+			prerelease = ""
+		// If branch is develop -> beta latestRelease
+		case "develop":
+			prerelease = "beta"
+		default:
+			branchPath := strings.Split(curCommitInfo.Branch, "/")
+			prerelease = branchPath[len(branchPath)-1]
+			prerelease = strcase.ToLowerCamel(prerelease)
+		}
+	}
+
+	if prerelease != "" {
+		logger.Println("Determined prerelease version: " + prerelease)
+	}
+
+	if !conf.AllowMaintainedVersionOnDefaultBranch && conf.MaintainedVersion != "" && currentBranch == defaultBranch {
 		exitIfError(fmt.Errorf("maintained version not allowed on default branch"))
 	}
 
 	if conf.MaintainedVersion != "" {
 		logger.Println("found maintained version: " + conf.MaintainedVersion)
-		repoInfo.DefaultBranch = "*"
+		defaultBranch = "*"
 	}
 
 	currentSha := ci.GetCurrentSHA()
@@ -150,7 +214,7 @@ func cliHandler(cmd *cobra.Command, args []string) {
 		"ci":            ciName,
 		"currentBranch": currentBranch,
 		"currentSha":    currentSha,
-		"defaultBranch": repoInfo.DefaultBranch,
+		"defaultBranch": defaultBranch,
 		"prerelease":    fmt.Sprintf("%t", conf.Prerelease),
 	}
 	for k, v := range conf.HooksOpts {
@@ -162,7 +226,7 @@ func cliHandler(cmd *cobra.Command, args []string) {
 		logger.Println("running CI condition...")
 		conditionConfig := map[string]string{
 			"token":         conf.Token,
-			"defaultBranch": repoInfo.DefaultBranch,
+			"defaultBranch": defaultBranch,
 			"private":       fmt.Sprintf("%t", repoInfo.Private),
 		}
 		for k, v := range conf.CIConditionOpts {
@@ -191,7 +255,7 @@ func cliHandler(cmd *cobra.Command, args []string) {
 	}
 	releases, err := prov.GetReleases(matchRegex)
 	exitIfError(err)
-	release, err := semrel.GetLatestReleaseFromReleases(releases, conf.MaintainedVersion)
+	release, err := semrel.GetLatestReleaseFromReleases(releases, conf.MaintainedVersion, prerelease)
 	exitIfError(err)
 	logger.Println("found version: " + release.Version)
 
@@ -212,7 +276,7 @@ func cliHandler(cmd *cobra.Command, args []string) {
 	commits := commitAnalyzer.Analyze(rawCommits)
 
 	logger.Println("calculating new version...")
-	newVer := semrel.GetNewVersion(conf, commits, release)
+	newVer := semrel.GetNewVersion(conf, commits, release, prerelease)
 	if newVer == "" {
 		herr := hooksExecutor.NoRelease(&hooks.NoReleaseConfig{
 			Reason:  hooks.NoReleaseReason_NO_CHANGE,

go.mod

@@ -5,8 +5,11 @@ go 1.17
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/cavaliergopher/grab/v3 v3.0.1
+	github.com/go-git/go-git/v5 v5.4.2
 	github.com/hashicorp/go-hclog v1.1.0
 	github.com/hashicorp/go-plugin v1.4.3
+	github.com/iancoleman/strcase v0.2.0
+	github.com/jbcpollak/strcase v0.0.0-20170614182632-a2c126df64d8
 	github.com/schollz/progressbar/v3 v3.8.5
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
@@ -16,36 +19,49 @@ require (
 )
 
 require (
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/spf13/afero v1.8.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect
 	gopkg.in/ini.v1 v1.66.3 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )