Merge remote-tracking branch 'origin/main' into github-release

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/google/go-github/v48 v48.0.0
 	github.com/google/uuid v1.3.0
 	github.com/goreleaser/fileglob v1.3.0
-	github.com/goreleaser/nfpm/v2 v2.21.0
+	github.com/goreleaser/nfpm/v2 v2.22.0
 	github.com/imdario/mergo v0.3.13
 	github.com/invopop/jsonschema v0.7.0
 	github.com/jarcoal/httpmock v1.2.0

go.sum

@@ -879,8 +879,8 @@ github.com/goreleaser/chglog v0.2.2 h1:V7nf07baXtGAgGevvqgW2MM4kZ6gOr12vKNSAU3VI
 github.com/goreleaser/chglog v0.2.2/go.mod h1:2s5JwtCOWjZa8AIneL+xdUl9SRuigCjRHNHsX30dupE=
 github.com/goreleaser/fileglob v1.3.0 h1:/X6J7U8lbDpQtBvGcwwPS6OpzkNVlVEsFUVRx9+k+7I=
 github.com/goreleaser/fileglob v1.3.0/go.mod h1:Jx6BoXv3mbYkEzwm9THo7xbr5egkAraxkGorbJb4RxU=
-github.com/goreleaser/nfpm/v2 v2.21.0 h1:zpj6IF8QlPuxVlrGw4F/VwG+fAWL4hjs3LQWCA4UAUs=
-github.com/goreleaser/nfpm/v2 v2.21.0/go.mod h1:TbVnjb/AJL/LwuQkLxfgG34fZTWM1LnScNHQroTNYO8=
+github.com/goreleaser/nfpm/v2 v2.22.0 h1:TC6tuxxFq0hL0WapI63+CkLMbcsYRbR7kAnLkRYAEbo=
+github.com/goreleaser/nfpm/v2 v2.22.0/go.mod h1:c5/coiBdrKNdXXgKnSCrqSk8OtltpGwJ2woU/8EtHD4=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

internal/pipe/docker/docker_test.go

@@ -271,15 +271,16 @@ func TestRunPipe(t *testing.T) {
 			extraPrepare: func(t *testing.T, ctx *context.Context) {
 				t.Helper()
 				for _, cmd := range []string{
-					fmt.Sprintf("docker manifest rm %sgoreleaser/test_multiarch:2test ", registry),
+					fmt.Sprintf("docker manifest rm %sgoreleaser/test_multiarch:2test || true", registry),
 					fmt.Sprintf("docker build -t %sgoreleaser/dummy:v1 --platform linux/amd64 -f testdata/Dockerfile.dummy .", registry),
 					fmt.Sprintf("docker push %sgoreleaser/dummy:v1", registry),
 					fmt.Sprintf("docker manifest create %sgoreleaser/test_multiarch:2test --amend %sgoreleaser/dummy:v1 --insecure", registry, registry),
 				} {
-					// t.Log("running", cmd)
-					parts := strings.Fields(cmd)
+					parts := strings.Fields(strings.TrimSuffix(cmd, " || true"))
 					out, err := exec.CommandContext(ctx, parts[0], parts[1:]...).CombinedOutput()
-					require.NoError(t, err, cmd+": "+string(out))
+					if !strings.HasSuffix(cmd, " || true") {
+						require.NoError(t, err, cmd+": "+string(out))
+					}
 				}
 			},
 		},