From a6c651a97ff907894df4ba97ce5261b0c28bacf7 Mon Sep 17 00:00:00 2001 From: fwiedmann Date: Tue, 13 Aug 2019 23:01:38 +0200 Subject: [PATCH 1/4] fix(github): remove 'draft' option because releases will always be published public --- internal/cache/cache_test.go | 9 ++++----- internal/calculator/calculator.go | 19 +++++++------------ internal/calculator/calculator_test.go | 13 +------------ internal/releaser/github/github.go | 1 - internal/releaser/github/github_test.go | 2 -- internal/releaser/gitlab/gitlab_test.go | 3 --- internal/shared/shared.go | 11 +++++------ pkg/config/config.go | 18 +++++++++--------- pkg/config/config_test.go | 7 +++---- pkg/semanticrelease/semantic-release.go | 4 +--- 10 files changed, 30 insertions(+), 57 deletions(-) diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go index d128c80..2660e05 100644 --- a/internal/cache/cache_test.go +++ b/internal/cache/cache_test.go @@ -3,13 +3,14 @@ package cache_test import ( "testing" + "io/ioutil" + "os" + "path" + "github.com/Masterminds/semver" "github.com/Nightapes/go-semantic-release/internal/cache" "github.com/Nightapes/go-semantic-release/internal/shared" "github.com/stretchr/testify/assert" - "io/ioutil" - "os" - "path" ) func TestReadCacheNotFound(t *testing.T) { @@ -54,7 +55,6 @@ func TestWriteAndReadCache(t *testing.T) { VersionString: "1.1.0", }, Branch: "master", - Draft: true, Commits: map[shared.Release][]shared.AnalyzedCommit{ "major": []shared.AnalyzedCommit{ shared.AnalyzedCommit{ @@ -97,7 +97,6 @@ func TestWriteNotFound(t *testing.T) { Version: createVersion("1.1.0"), }, Branch: "master", - Draft: true, }) assert.Errorf(t, err, "Write non exsiting file") diff --git a/internal/calculator/calculator.go b/internal/calculator/calculator.go index 69c6eca..21558ae 100644 --- a/internal/calculator/calculator.go +++ b/internal/calculator/calculator.go @@ -40,29 +40,24 @@ func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Versio } //CalculateNewVersion from given commits and lastversion -func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) (semver.Version, bool) { +func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version { switch releaseType { - case "beta", "alpha": + case "beta", "alpha", "rc": if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 { version, _ := c.IncPrerelease(releaseType, lastVersion) - return version, true - } - case "rc": - if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 { - version, _ := c.IncPrerelease(releaseType, lastVersion) - return version, false + return version } case "release": if !firstRelease { if len(commits["major"]) > 0 { - return lastVersion.IncMajor(), false + return lastVersion.IncMajor() } else if len(commits["minor"]) > 0 { - return lastVersion.IncMinor(), false + return lastVersion.IncMinor() } else if len(commits["patch"]) > 0 { - return lastVersion.IncPatch(), false + return lastVersion.IncPatch() } } } - return *lastVersion, false + return *lastVersion } diff --git a/internal/calculator/calculator_test.go b/internal/calculator/calculator_test.go index 50a1577..5abe677 100644 --- a/internal/calculator/calculator_test.go +++ b/internal/calculator/calculator_test.go @@ -72,7 +72,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { releaseType string lastVersion *semver.Version nextVersion string - isDraft bool isFirst bool analyzedCommits map[shared.Release][]shared.AnalyzedCommit }{ @@ -90,7 +89,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: true, }, { testCase: "version with preRelease beta", @@ -106,7 +104,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: true, }, { testCase: "version without commits", @@ -120,7 +117,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, { testCase: "version with commits and first release", @@ -134,7 +130,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: true, - isDraft: false, }, { testCase: "version with commits and rc release", @@ -148,7 +143,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, { testCase: "version with commits and rc release", @@ -162,7 +156,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, { testCase: "version with commits and major release", @@ -176,7 +169,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, { testCase: "version with commits and minor release", @@ -190,7 +182,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, { testCase: "version with commits and minor patch", @@ -204,15 +195,13 @@ func TestCalculator_CalculateNewVersion(t *testing.T) { "none": []shared.AnalyzedCommit{}, }, isFirst: false, - isDraft: false, }, } c := calculator.New() for _, test := range testConfigs { - next, draft := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst) - assert.Equalf(t, test.isDraft, draft, "Should have draft %t for testcase %s", test.isDraft, test.testCase) + next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst) assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase) } diff --git a/internal/releaser/github/github.go b/internal/releaser/github/github.go index a7c631e..e45186b 100644 --- a/internal/releaser/github/github.go +++ b/internal/releaser/github/github.go @@ -96,7 +96,6 @@ func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedC TargetCommitish: &releaseVersion.Branch, Name: &generatedChangelog.Title, Body: &generatedChangelog.Content, - Draft: &releaseVersion.Draft, Prerelease: &prerelease, }) if err != nil { diff --git a/internal/releaser/github/github_test.go b/internal/releaser/github/github_test.go index d9ab789..b3d4c6e 100644 --- a/internal/releaser/github/github_test.go +++ b/internal/releaser/github/github_test.go @@ -90,7 +90,6 @@ var testReleases = []testReleaseStruct{ Commit: "bar", }, Branch: "master", - Draft: false, }, generatedChangelog: &shared.GeneratedChangelog{ Title: "title", @@ -115,7 +114,6 @@ var testReleases = []testReleaseStruct{ Commit: "bar", }, Branch: "master", - Draft: false, }, generatedChangelog: &shared.GeneratedChangelog{ Title: "title", diff --git a/internal/releaser/gitlab/gitlab_test.go b/internal/releaser/gitlab/gitlab_test.go index 944dd87..da51df4 100644 --- a/internal/releaser/gitlab/gitlab_test.go +++ b/internal/releaser/gitlab/gitlab_test.go @@ -94,7 +94,6 @@ func TestCreateRelease(t *testing.T) { Commit: "bar", }, Branch: "master", - Draft: false, }, generatedChangelog: &shared.GeneratedChangelog{ Title: "title", @@ -119,7 +118,6 @@ func TestCreateRelease(t *testing.T) { Commit: "bar", }, Branch: "master", - Draft: false, }, generatedChangelog: &shared.GeneratedChangelog{ Title: "title", @@ -145,7 +143,6 @@ func TestCreateRelease(t *testing.T) { Commit: "bar", }, Branch: "master", - Draft: false, }, generatedChangelog: &shared.GeneratedChangelog{ Title: "title", diff --git a/internal/shared/shared.go b/internal/shared/shared.go index da30e3a..5aee964 100644 --- a/internal/shared/shared.go +++ b/internal/shared/shared.go @@ -6,17 +6,16 @@ import ( //ReleaseVersion struct type ReleaseVersion struct { - Last ReleaseVersionEntry `yaml:"last"` - Next ReleaseVersionEntry `yaml:"next"` - Branch string `yaml:"branch"` - Draft bool `yaml:"draft"` + Last ReleaseVersionEntry `yaml:"last"` + Next ReleaseVersionEntry `yaml:"next"` + Branch string `yaml:"branch"` Commits map[Release][]AnalyzedCommit `yaml:"commits"` } //ReleaseVersionEntry struct type ReleaseVersionEntry struct { - Commit string `yaml:"commit"` - VersionString string `yaml:"version"` + Commit string `yaml:"commit"` + VersionString string `yaml:"version"` Version *semver.Version `yaml:"-"` } diff --git a/pkg/config/config.go b/pkg/config/config.go index 31936d0..a2767ba 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -38,15 +38,15 @@ type GitLabProvider struct { // ReleaseConfig struct type ReleaseConfig struct { - CommitFormat string `yaml:"commitFormat"` - Branch map[string]string `yaml:"branch"` - Changelog ChangelogConfig `yaml:"changelog,omitempty"` - Release string `yaml:"release,omitempty"` - GitHubProvider GitHubProvider `yaml:"github,omitempty"` - GitLabProvider GitLabProvider `yaml:"gitlab,omitempty"` - Assets []Asset `yaml:"assets"` - ReleaseTitle string `yaml:"title"` - IsPreRelease, IsDraft bool + CommitFormat string `yaml:"commitFormat"` + Branch map[string]string `yaml:"branch"` + Changelog ChangelogConfig `yaml:"changelog,omitempty"` + Release string `yaml:"release,omitempty"` + GitHubProvider GitHubProvider `yaml:"github,omitempty"` + GitLabProvider GitLabProvider `yaml:"gitlab,omitempty"` + Assets []Asset `yaml:"assets"` + ReleaseTitle string `yaml:"title"` + IsPreRelease bool } // Read ReleaseConfig diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index ca3cc13..3a3a3ce 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -3,11 +3,12 @@ package config_test import ( "testing" - "github.com/Nightapes/go-semantic-release/pkg/config" - "github.com/stretchr/testify/assert" "io/ioutil" "os" "path" + + "github.com/Nightapes/go-semantic-release/pkg/config" + "github.com/stretchr/testify/assert" ) func TestReadCacheNotFound(t *testing.T) { @@ -88,7 +89,6 @@ github: Compress: false}}, ReleaseTitle: "go-semantic-release release", IsPreRelease: false, - IsDraft: false, }, result) } @@ -105,7 +105,6 @@ github: // Version: createVersion("1.1.0"), // }, // Branch: "master", -// Draft: true, // }) // assert.Errorf(t, err, "Write non exsiting file") diff --git a/pkg/semanticrelease/semantic-release.go b/pkg/semanticrelease/semantic-release.go index 69e0ae3..ed5e1ea 100644 --- a/pkg/semanticrelease/semantic-release.go +++ b/pkg/semanticrelease/semantic-release.go @@ -97,12 +97,11 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool analyzedCommits := s.analyzer.Analyze(commits) - isDraft := false var newVersion semver.Version for branch, releaseType := range s.config.Branch { if provider.Branch == branch || strings.HasPrefix(provider.Branch, branch) { log.Debugf("Found branch config for branch %s with release type %s", provider.Branch, releaseType) - newVersion, isDraft = s.calculator.CalculateNewVersion(analyzedCommits, lastVersion, releaseType, firstRelease) + newVersion = s.calculator.CalculateNewVersion(analyzedCommits, lastVersion, releaseType, firstRelease) break } } @@ -117,7 +116,6 @@ func (s *SemanticRelease) GetNextVersion(provider *ci.ProviderConfig, force bool Version: lastVersion, }, Branch: provider.Branch, - Draft: isDraft, Commits: analyzedCommits, } From 2eb64f153a6e902ffdb025faec93160b9975f2f9 Mon Sep 17 00:00:00 2001 From: fwiedmann Date: Tue, 13 Aug 2019 23:28:13 +0200 Subject: [PATCH 2/4] test(util): add defer statement for testServer --- internal/releaser/util/util_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/releaser/util/util_test.go b/internal/releaser/util/util_test.go index 52822ea..7303cd4 100644 --- a/internal/releaser/util/util_test.go +++ b/internal/releaser/util/util_test.go @@ -214,6 +214,8 @@ func TestDoAndRoundTrip(t *testing.T) { })) + defer testServer.Close() + req, err := http.NewRequest("POST", testServer.URL+testOject.path, nil) assert.NoError(t, err) @@ -225,6 +227,6 @@ func TestDoAndRoundTrip(t *testing.T) { assert.Equal(t, testOject.statusCode, resp.StatusCode) assert.Equal(t, testOject.responseBody, testOject.responseBodyType) } - testServer.Close() + // testServer.Close() } } From a2fc03c64da2b925b57959e481b9bc77cf51d293 Mon Sep 17 00:00:00 2001 From: fwiedmann Date: Thu, 22 Aug 2019 00:12:24 +0200 Subject: [PATCH 3/4] Merge branch 'master' of github.com:Nightapes/go-semantic-release into remove/draft --- .github/workflows/main.yml | 44 +++++++++++++++++++++++++ internal/ci/ci.go | 1 + internal/ci/ci_test.go | 22 +++++++++++++ internal/ci/github_actions.go | 43 ++++++++++++++++++++++++ internal/releaser/github/github.go | 2 +- internal/releaser/github/github_test.go | 20 +++++------ internal/releaser/releaser.go | 3 +- internal/releaser/util/util.go | 4 +-- internal/releaser/util/util_test.go | 4 +-- pkg/semanticrelease/semantic-release.go | 4 +-- 10 files changed, 128 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/main.yml create mode 100644 internal/ci/github_actions.go diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..61a02b7 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,44 @@ +name: Go +on: [push, pull_request] +jobs: + + build: + name: Build + runs-on: ubuntu-latest + steps: + + - name: tmp + run: | + echo $GITHUB_EVENT_NAME + cat $GITHUB_EVENT_PATH + + - name: Set up Go 1.12 + uses: actions/setup-go@v1 + with: + go-version: 1.12 + id: go + + - name: Check out code into the Go module directory + uses: actions/checkout@v1 + + - name: Lint + run: | + export PATH=$PATH:$(go env GOPATH)/bin + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0 + golangci-lint run ./... + + - name: Run tests + run: go test ./... + + - name: Build binary + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + go build -o build/go-semantic-release-temp ./cmd/go-semantic-release/ + go build -o build/go-semantic-release -ldflags "-w -s --X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/ + GOOS=windows GOARCH=386 go build -o build/go-semantic-release.exe -ldflags "-w -s -X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/ + + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: ./build/go-semantic-release-temp release --loglevel trace diff --git a/internal/ci/ci.go b/internal/ci/ci.go index 4f1acd6..066271c 100644 --- a/internal/ci/ci.go +++ b/internal/ci/ci.go @@ -42,6 +42,7 @@ func GetCIProvider(gitUtil *gitutil.GitUtil, envs map[string]string) (*ProviderC services := []Service{ Travis{}, + GithubActions{}, Git{gitUtil: gitUtil}, // GIt must be the last option to check } diff --git a/internal/ci/ci_test.go b/internal/ci/ci_test.go index 38a24a1..31ecd0c 100644 --- a/internal/ci/ci_test.go +++ b/internal/ci/ci_test.go @@ -89,6 +89,28 @@ func TestCi(t *testing.T) { result: &ci.ProviderConfig{IsPR: false, PR: "", PRBranch: "", Branch: "master", Tag: "TAG", Commit: "190bfd6aa60022afd0ef830342cfb07e33c45f37", BuildURL: "https://travis-ci.com/owner/repo/builds/1234", Service: "travis", Name: "Travis CI"}, hasError: false, }, + { + service: "Github Actions PR", + envs: map[string]string{ + "GITHUB_EVENT_NAME": "pull_request", + "GITHUB_SHA": "190bfd6aa60022afd0ef830342cfb07e33c45f37", + "GITHUB_REF": "master", + "GITHUB_ACTION": "action", + }, + result: &ci.ProviderConfig{IsPR: true, PR: "", PRBranch: "", Branch: "master", Tag: "", Commit: "190bfd6aa60022afd0ef830342cfb07e33c45f37", BuildURL: "", Service: "GithubActions", Name: "GithubActions CI"}, + hasError: false, + }, + { + service: "Github Actions Push", + envs: map[string]string{ + "GITHUB_EVENT_NAME": "push", + "GITHUB_SHA": "190bfd6aa60022afd0ef830342cfb07e33c45f37", + "GITHUB_REF": "refs/heads/feature-branch-1", + "GITHUB_ACTION": "action", + }, + result: &ci.ProviderConfig{IsPR: false, PR: "", PRBranch: "", Branch: "feature-branch-1", Tag: "", Commit: "190bfd6aa60022afd0ef830342cfb07e33c45f37", BuildURL: "", Service: "GithubActions", Name: "GithubActions CI"}, + hasError: false, + }, } for _, config := range testConfigs { diff --git a/internal/ci/github_actions.go b/internal/ci/github_actions.go new file mode 100644 index 0000000..38b1aa4 --- /dev/null +++ b/internal/ci/github_actions.go @@ -0,0 +1,43 @@ +package ci + +import ( + "fmt" + "strings" + + log "github.com/sirupsen/logrus" +) + +//GithubActions struct +type GithubActions struct{} + +//Detect if on GithubActions +func (t GithubActions) detect(envs map[string]string) (*ProviderConfig, error) { + + if _, exists := envs["GITHUB_ACTION"]; !exists { + return nil, fmt.Errorf("not running on Github Actions") + } + + isPR := false + + value := envs["GITHUB_EVENT_NAME"] + + if value == "pull_request" { + isPR = true + } else { + log.Debugf("GITHUB_EVENT_NAME=%s, not running on pr", value) + } + + branch := envs["GITHUB_REF"] + + if strings.HasPrefix(envs["GITHUB_REF"], "refs/heads/") { + branch = strings.Replace(branch, "refs/heads/", "", 1) + } + + return &ProviderConfig{ + Service: "GithubActions", + Name: "GithubActions CI", + Commit: envs["GITHUB_SHA"], + Branch: branch, + IsPR: isPR, + }, nil +} diff --git a/internal/releaser/github/github.go b/internal/releaser/github/github.go index e45186b..f279636 100644 --- a/internal/releaser/github/github.go +++ b/internal/releaser/github/github.go @@ -32,7 +32,7 @@ type Client struct { func New(c *config.GitHubProvider) (*Client, error) { var err error - if c.AccessToken, err = util.GetAccessToken(GITHUB); err != nil { + if c.AccessToken, err = util.GetAccessToken("GITHUB_TOKEN"); err != nil { return &Client{}, err } ctx := context.Background() diff --git a/internal/releaser/github/github_test.go b/internal/releaser/github/github_test.go index b3d4c6e..6813c11 100644 --- a/internal/releaser/github/github_test.go +++ b/internal/releaser/github/github_test.go @@ -143,19 +143,19 @@ func initHTTPServer(respCode int, body string) *httptest.Server { func TestNew(t *testing.T) { for _, testOject := range testNewClient { if testOject.valid { - os.Setenv("GITHUB_ACCESS_TOKEN", "XXX") + os.Setenv("GITHUB_TOKEN", "XXX") } _, err := github.New(&testOject.config) assert.Equal(t, testOject.valid, err == nil) - os.Unsetenv("GITHUB_ACCESS_TOKEN") + os.Unsetenv("GITHUB_TOKEN") } } func TestGetCommitURL(t *testing.T) { - os.Setenv("GITHUB_ACCESS_TOKEN", "XX") + os.Setenv("GITHUB_TOKEN", "XX") for _, testOject := range testNewClient { client, _ := github.New(&testOject.config) actualURL := client.GetCommitURL() @@ -168,12 +168,12 @@ func TestGetCommitURL(t *testing.T) { assert.EqualValues(t, expectedURL, actualURL) } } - os.Unsetenv("GITHUB_ACCESS_TOKEN") + os.Unsetenv("GITHUB_TOKEN") } func TestGetCompareURL(t *testing.T) { - os.Setenv("GITHUB_ACCESS_TOKEN", "XX") + os.Setenv("GITHUB_TOKEN", "XX") for _, testOject := range testNewClient { client, _ := github.New(&testOject.config) actualURL := client.GetCompareURL("1", "2") @@ -186,12 +186,12 @@ func TestGetCompareURL(t *testing.T) { assert.EqualValues(t, expectedURL, actualURL) } } - os.Unsetenv("GITHUB_ACCESS_TOKEN") + os.Unsetenv("GITHUB_TOKEN") } func TestValidateConfig(t *testing.T) { - os.Setenv("GITHUB_ACCESS_TOKEN", "XX") + os.Setenv("GITHUB_TOKEN", "XX") for _, testOject := range testHelperMethod { client, _ := github.New(&testOject.config) err := client.ValidateConfig() @@ -199,11 +199,11 @@ func TestValidateConfig(t *testing.T) { assert.Equal(t, testOject.valid, err == nil) } - os.Unsetenv("GITHUB_ACCESS_TOKEN") + os.Unsetenv("GITHUB_TOKEN") } func TestCreateRelease(t *testing.T) { - os.Setenv("GITHUB_ACCESS_TOKEN", "XX") + os.Setenv("GITHUB_TOKEN", "XX") for _, testObejct := range testReleases { if testObejct.valid { @@ -230,6 +230,6 @@ func TestCreateRelease(t *testing.T) { assert.Error(t, err) } } - os.Unsetenv("GITHUB_ACCESS_TOKEN") + os.Unsetenv("GITHUB_TOKEN") } diff --git a/internal/releaser/releaser.go b/internal/releaser/releaser.go index d96f49f..0aa21f3 100644 --- a/internal/releaser/releaser.go +++ b/internal/releaser/releaser.go @@ -2,6 +2,7 @@ package releaser import ( "fmt" + "strings" "github.com/Nightapes/go-semantic-release/internal/releaser/github" "github.com/Nightapes/go-semantic-release/internal/releaser/gitlab" @@ -41,7 +42,7 @@ func (r *Releasers) GetReleaser() (Releaser, error) { return github.New(&r.config.GitHubProvider) case gitlab.GITLAB: log.Debugf("initialize new %s-provider", gitlab.GITLAB) - accessToken, err := util.GetAccessToken(gitlab.GITLAB) + accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(gitlab.GITLAB))) if err != nil { return nil, err } diff --git a/internal/releaser/util/util.go b/internal/releaser/util/util.go index 5bde7e3..5e4b42b 100644 --- a/internal/releaser/util/util.go +++ b/internal/releaser/util/util.go @@ -49,11 +49,9 @@ func NewAddHeaderTransport(T http.RoundTripper, key, value string) *AddHeaderTra } // GetAccessToken lookup for the providers accesstoken -func GetAccessToken(providerName string) (string, error) { +func GetAccessToken(envName string) (string, error) { var token string var exists bool - envName := fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(providerName)) - log.Debugf("check if %s environment variable is set", envName) if token, exists = os.LookupEnv(envName); !exists { diff --git a/internal/releaser/util/util_test.go b/internal/releaser/util/util_test.go index 7303cd4..7878fe2 100644 --- a/internal/releaser/util/util_test.go +++ b/internal/releaser/util/util_test.go @@ -43,7 +43,7 @@ func TestGetAccessToken(t *testing.T) { fmt.Println(err.Error()) } - _, err := util.GetAccessToken(testObject.providerName) + _, err := util.GetAccessToken(envName) assert.Equal(t, testObject.valid, err == nil) os.Unsetenv(envName) @@ -193,7 +193,7 @@ func TestDoAndRoundTrip(t *testing.T) { hasError: true, responseBody: &example{}, responseBodyType: &example{}, - path: "broken", + path: "4/broken", }, } diff --git a/pkg/semanticrelease/semantic-release.go b/pkg/semanticrelease/semantic-release.go index ed5e1ea..43efc5e 100644 --- a/pkg/semanticrelease/semantic-release.go +++ b/pkg/semanticrelease/semantic-release.go @@ -177,12 +177,12 @@ func (s *SemanticRelease) WriteChangeLog(changelogContent, file string) error { func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error { if provider.IsPR { - log.Debugf("Will not perform a new release. This is a pull request") + log.Infof("Will not perform a new release. This is a pull request") return nil } if _, ok := s.config.Branch[provider.Branch]; !ok { - log.Debugf("Will not perform a new release. Current %s branch is not configured in release config", provider.Branch) + log.Infof("Will not perform a new release. Current %s branch is not configured in release config", provider.Branch) return nil } From df544f5be7393764f7b53374846c660f87a5b544 Mon Sep 17 00:00:00 2001 From: Felix Wiedmann <30576206+fwiedmann@users.noreply.github.com> Date: Thu, 22 Aug 2019 09:17:40 +0200 Subject: [PATCH 4/4] docs(releaser/util): remove unnecessary comment --- internal/releaser/util/util_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/releaser/util/util_test.go b/internal/releaser/util/util_test.go index 7878fe2..a6adfe5 100644 --- a/internal/releaser/util/util_test.go +++ b/internal/releaser/util/util_test.go @@ -227,6 +227,5 @@ func TestDoAndRoundTrip(t *testing.T) { assert.Equal(t, testOject.statusCode, resp.StatusCode) assert.Equal(t, testOject.responseBody, testOject.responseBodyType) } - // testServer.Close() } }