From b33f14c0fa06d75218b33b60d8b64dc05026ea43 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:36:21 -0300
Subject: [PATCH] fix: better universalbinary message (#4627)

<!--

Hi, thanks for contributing!

Please make sure you read our CONTRIBUTING guide.

Also, add tests and the respective documentation changes as well.

-->


<!-- If applied, this commit will... -->

...

<!-- Why is this change being made? -->

...

<!-- # Provide links to any relevant tickets, URLs or other resources
-->

...

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
---
 internal/pipe/universalbinary/universalbinary.go      | 3 ++-
 internal/pipe/universalbinary/universalbinary_test.go | 4 ++--
 www/docs/customization/universalbinaries.md           | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/pipe/universalbinary/universalbinary.go b/internal/pipe/universalbinary/universalbinary.go
index c273ef5d9..f67f4de8a 100644
--- a/internal/pipe/universalbinary/universalbinary.go
+++ b/internal/pipe/universalbinary/universalbinary.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/caarlos0/go-shellwords"
 	"github.com/caarlos0/log"
@@ -157,7 +158,7 @@ func makeUniversalBinary(ctx *context.Context, opts *build.Options, unibin confi
 
 	binaries := ctx.Artifacts.Filter(filterFor(unibin)).List()
 	if len(binaries) == 0 {
-		return pipe.Skipf("no darwin binaries found with id %q", unibin.ID)
+		return pipe.Skipf("no darwin binaries found with ids: %s", strings.Join(unibin.IDs, ", "))
 	}
 
 	log.WithField("id", unibin.ID).
diff --git a/internal/pipe/universalbinary/universalbinary_test.go b/internal/pipe/universalbinary/universalbinary_test.go
index 2a9bbbd74..f96204951 100644
--- a/internal/pipe/universalbinary/universalbinary_test.go
+++ b/internal/pipe/universalbinary/universalbinary_test.go
@@ -149,7 +149,7 @@ func TestRun(t *testing.T) {
 		UniversalBinaries: []config.UniversalBinary{
 			{
 				ID:           "notfoo",
-				IDs:          []string{"notfoo"},
+				IDs:          []string{"notfoo", "notbar"},
 				NameTemplate: "notfoo",
 			},
 		},
@@ -294,7 +294,7 @@ func TestRun(t *testing.T) {
 	})
 
 	t.Run("no darwin builds", func(t *testing.T) {
-		require.EqualError(t, Pipe{}.Run(ctx3), `no darwin binaries found with id "notfoo"`)
+		require.EqualError(t, Pipe{}.Run(ctx3), `no darwin binaries found with ids: notfoo, notbar`)
 	})
 
 	t.Run("fail to open", func(t *testing.T) {
diff --git a/www/docs/customization/universalbinaries.md b/www/docs/customization/universalbinaries.md
index 1495255c6..1ac33f669 100644
--- a/www/docs/customization/universalbinaries.md
+++ b/www/docs/customization/universalbinaries.md
@@ -16,6 +16,9 @@ universal_binaries:
 
     # IDs to use to filter the built binaries.
     #
+    # Notice that you shouldn't include different apps' IDs here.
+    # This field is usually only required if you are using CGO.
+    #
     # Default: the value of the id field
     # Since: v1.3
     ids: