From 17e4d627912d5df8d5ced171c05b6dd9867b477e Mon Sep 17 00:00:00 2001
From: Carlos A Becker <caarlos0@users.noreply.github.com>
Date: Wed, 11 May 2022 11:41:33 -0300
Subject: [PATCH] fix: revert defaulting build.id to build.binary

refs #3098
refs #3063

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
---
 internal/pipe/build/build.go      | 2 +-
 internal/pipe/build/build_test.go | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/internal/pipe/build/build.go b/internal/pipe/build/build.go
index 9462eec1347..a5a03a33da8 100644
--- a/internal/pipe/build/build.go
+++ b/internal/pipe/build/build.go
@@ -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)
diff --git a/internal/pipe/build/build_test.go b/internal/pipe/build/build_test.go
index 1fbb1ff86fb..b5d2047651d 100644
--- a/internal/pipe/build/build_test.go
+++ b/internal/pipe/build/build_test.go
@@ -288,7 +288,6 @@ func TestDefaultBuildID(t *testing.T) {
 			Builds: []config.Build{
 				{
 					Binary: "{{.Env.FOO}}",
-					ID:     "bar",
 				},
 				{
 					Binary: "bar",
@@ -296,11 +295,11 @@ func TestDefaultBuildID(t *testing.T) {
 			},
 		},
 	}
-	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) {