Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactory: making merges with pro easier #3400

Merged
merged 2 commits into from Sep 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/release.go
Expand Up @@ -113,7 +113,7 @@ func releaseProject(options releaseOpts) (*context.Context, error) {
})
}

func setupReleaseContext(ctx *context.Context, options releaseOpts) *context.Context {
func setupReleaseContext(ctx *context.Context, options releaseOpts) {
ctx.Parallelism = runtime.NumCPU()
if options.parallelism > 0 {
ctx.Parallelism = options.parallelism
Expand Down Expand Up @@ -141,5 +141,4 @@ func setupReleaseContext(ctx *context.Context, options releaseOpts) *context.Con

// test only
ctx.Deprecated = options.deprecated
return ctx
}
19 changes: 11 additions & 8 deletions cmd/release_test.go
Expand Up @@ -54,12 +54,15 @@ func TestReleaseBrokenProject(t *testing.T) {
}

func TestReleaseFlags(t *testing.T) {
setup := func(opts releaseOpts) *context.Context {
return setupReleaseContext(context.New(config.Project{}), opts)
setup := func(tb testing.TB, opts releaseOpts) *context.Context {
tb.Helper()
ctx := context.New(config.Project{})
setupReleaseContext(ctx, opts)
return ctx
}

t.Run("snapshot", func(t *testing.T) {
ctx := setup(releaseOpts{
ctx := setup(t, releaseOpts{
snapshot: true,
})
require.True(t, ctx.Snapshot)
Expand All @@ -69,7 +72,7 @@ func TestReleaseFlags(t *testing.T) {
})

t.Run("skips", func(t *testing.T) {
ctx := setup(releaseOpts{
ctx := setup(t, releaseOpts{
skipPublish: true,
skipSign: true,
skipValidate: true,
Expand All @@ -81,7 +84,7 @@ func TestReleaseFlags(t *testing.T) {
})

t.Run("parallelism", func(t *testing.T) {
require.Equal(t, 1, setup(releaseOpts{
require.Equal(t, 1, setup(t, releaseOpts{
parallelism: 1,
}).Parallelism)
})
Expand All @@ -90,7 +93,7 @@ func TestReleaseFlags(t *testing.T) {
notes := "foo.md"
header := "header.md"
footer := "footer.md"
ctx := setup(releaseOpts{
ctx := setup(t, releaseOpts{
releaseNotesFile: notes,
releaseHeaderFile: header,
releaseFooterFile: footer,
Expand All @@ -104,7 +107,7 @@ func TestReleaseFlags(t *testing.T) {
notes := "foo.md"
header := "header.md"
footer := "footer.md"
ctx := setup(releaseOpts{
ctx := setup(t, releaseOpts{
releaseNotesTmpl: notes,
releaseHeaderTmpl: header,
releaseFooterTmpl: footer,
Expand All @@ -115,7 +118,7 @@ func TestReleaseFlags(t *testing.T) {
})

t.Run("rm dist", func(t *testing.T) {
require.True(t, setup(releaseOpts{
require.True(t, setup(t, releaseOpts{
rmDist: true,
}).RmDist)
})
Expand Down