Skip to content

Commit

Permalink
fix: revert defaulting build.id to build.binary
Browse files Browse the repository at this point in the history
refs #3098
refs #3063

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
  • Loading branch information
caarlos0 committed May 11, 2022
1 parent a5ef8e3 commit 17e4d62
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion internal/pipe/build/build.go
Expand Up @@ -73,7 +73,7 @@ func buildWithDefaults(ctx *context.Context, build config.Build) (config.Build,
build.Binary = ctx.Config.ProjectName
}
if build.ID == "" {
build.ID = build.Binary
build.ID = ctx.Config.ProjectName
}
for k, v := range build.Env {
build.Env[k] = os.ExpandEnv(v)
Expand Down
5 changes: 2 additions & 3 deletions internal/pipe/build/build_test.go
Expand Up @@ -288,19 +288,18 @@ func TestDefaultBuildID(t *testing.T) {
Builds: []config.Build{
{
Binary: "{{.Env.FOO}}",
ID: "bar",
},
{
Binary: "bar",
},
},
},
}
require.EqualError(t, Pipe{}.Default(ctx), "found 2 builds with the ID 'bar', please fix your config")
require.EqualError(t, Pipe{}.Default(ctx), "found 2 builds with the ID 'foo', please fix your config")
build1 := ctx.Config.Builds[0].ID
build2 := ctx.Config.Builds[1].ID
require.Equal(t, build1, build2)
require.Equal(t, "bar", build2)
require.Equal(t, "foo", build2)
}

func TestSeveralBuildsWithTheSameID(t *testing.T) {
Expand Down

0 comments on commit 17e4d62

Please sign in to comment.