feat: add gitlab flag

Author: christophwitzko

cmd/semantic-release/main.go

@@ -61,10 +61,9 @@ func cliHandler(c *cli.Context) error {
 		err  error
 	)
 
-	switch ci.Name() {
-	case "Gitlab":
-		repo, err = semrel.NewGitlabRepository(c.Context, conf.Gitlab.BaseURL, conf.Slug, conf.Token, ci.GetCurrentBranch(), conf.Gitlab.ProjectID)
-	default:
+	if conf.GitLab {
+		repo, err = semrel.NewGitlabRepository(c.Context, conf.GitLabBaseURL, conf.Slug, conf.Token, ci.GetCurrentBranch(), conf.GitLabProjectID)
+	} else {
 		repo, err = semrel.NewGithubRepository(c.Context, conf.GheHost, conf.Slug, conf.Token)
 	}
 

pkg/condition/condition.go

@@ -50,7 +50,7 @@ func NewCI() CI {
 		return &TravisCI{}
 	}
 	if os.Getenv("GITLAB_CI") == "true" {
-		return &Gitlab{}
+		return &GitLab{}
 	}
 	return &DefaultCI{}
 }

pkg/condition/gitlab.go

@@ -5,26 +5,26 @@ import (
 	"os"
 )
 
-type Gitlab struct {
+type GitLab struct {
 }
 
-func (gl *Gitlab) Name() string {
-	return "Gitlab"
+func (gl *GitLab) Name() string {
+	return "GitLab CI"
 }
 
-func (gl *Gitlab) GetCurrentBranch() string {
+func (gl *GitLab) GetCurrentBranch() string {
 	return os.Getenv("CI_COMMIT_BRANCH")
 }
 
-func (gl *Gitlab) GetCurrentSHA() string {
+func (gl *GitLab) GetCurrentSHA() string {
 	return os.Getenv("CI_COMMIT_SHA")
 }
 
-func (gl *Gitlab) IsBranchRef() bool {
+func (gl *GitLab) IsBranchRef() bool {
 	return gl.GetCurrentBranch() != ""
 }
 
-func (gl *Gitlab) RunCondition(config CIConfig) error {
+func (gl *GitLab) RunCondition(config CIConfig) error {
 	defaultBranch := config["defaultBranch"].(string)
 	if !gl.IsBranchRef() {
 		return fmt.Errorf("This test run is not running on a branch build.")

pkg/condition/gitlab_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func TestGitlabValid(t *testing.T) {
-	gl := Gitlab{}
+	gl := GitLab{}
 	err := gl.RunCondition(CIConfig{"defaultBranch": ""})
 	if err == nil {
 		t.Fail()

pkg/config/config.go

@@ -8,12 +8,6 @@ import (
 )
 
 type (
-	// Gitlab Specific Config
-	GitlabConfig struct {
-		BaseURL   string
-		ProjectID string
-	}
-
 	// Config is a complete set of app configuration
 	Config struct {
 		Token                           string
@@ -25,12 +19,14 @@ type (
 		Vf                              bool
 		Update                          string
 		GheHost                         string
-		Gitlab                          GitlabConfig
 		Prerelease                      bool
 		TravisCom                       bool
 		BetaRelease                     BetaRelease
 		Match                           string
 		AllowInitialDevelopmentVersions bool
+		GitLab                          bool
+		GitLabBaseURL                   string
+		GitLabProjectID                 string
 	}
 
 	BetaRelease struct {
@@ -54,10 +50,9 @@ func NewConfig(c *cli.Context) *Config {
 		TravisCom:                       c.Bool("travis-com"),
 		Match:                           c.String("match"),
 		AllowInitialDevelopmentVersions: c.Bool("allow-initial-development-versions"),
-		Gitlab: GitlabConfig{
-			BaseURL:   c.String("gitlab-base-url"),
-			ProjectID: c.String("gitlab-project-id"),
-		},
+		GitLab:                          c.Bool("gitlab"),
+		GitLabBaseURL:                   c.String("gitlab-base-url"),
+		GitLabProjectID:                 c.String("gitlab-project-id"),
 	}
 
 	f, err := os.OpenFile(".semrelrc", os.O_RDONLY, 0)

pkg/config/flags.go

@@ -59,14 +59,19 @@ var CliFlags = []cli.Flag{
 		Name:  "match",
 		Usage: "Only consider tags matching the given glob(7) pattern, excluding the \"refs/tags/\" prefix.",
 	},
+	&cli.BoolFlag{
+		Name:    "gitlab",
+		Usage:   "run semantic-release on GitLab",
+		EnvVars: []string{"GITLAB_CI"},
+	},
 	&cli.StringFlag{
 		Name:    "gitlab-base-url",
-		Usage:   "Gitlab self hosted api path",
+		Usage:   "GitLab self hosted api path",
 		EnvVars: []string{"CI_SERVER_URL"},
 	},
 	&cli.StringFlag{
 		Name:    "gitlab-project-id",
-		Usage:   "Gitlab project unique id",
+		Usage:   "GitLab project unique id",
 		EnvVars: []string{"CI_PROJECT_ID"},
 	},
 	&cli.BoolFlag{