diff --git a/internal/pipe/publish/publish.go b/internal/pipe/publish/publish.go index 223e4ef10f3..f2c36243fa7 100644 --- a/internal/pipe/publish/publish.go +++ b/internal/pipe/publish/publish.go @@ -13,6 +13,7 @@ import ( "github.com/goreleaser/goreleaser/internal/pipe/milestone" "github.com/goreleaser/goreleaser/internal/pipe/release" "github.com/goreleaser/goreleaser/internal/pipe/scoop" + "github.com/goreleaser/goreleaser/internal/pipe/sign" "github.com/goreleaser/goreleaser/internal/pipe/snapcraft" "github.com/goreleaser/goreleaser/internal/pipe/upload" "github.com/goreleaser/goreleaser/pkg/context" @@ -41,6 +42,7 @@ var publishers = []Publisher{ artifactory.Pipe{}, docker.Pipe{}, docker.ManifestPipe{}, + sign.DockerPipe{}, snapcraft.Pipe{}, // This should be one of the last steps release.Pipe{}, diff --git a/internal/pipe/sign/sign_docker.go b/internal/pipe/sign/sign_docker.go index d7f4468b5d0..5a629c78ba7 100644 --- a/internal/pipe/sign/sign_docker.go +++ b/internal/pipe/sign/sign_docker.go @@ -39,8 +39,8 @@ func (DockerPipe) Default(ctx *context.Context) error { return ids.Validate() } -// Run executes the Pipe. -func (DockerPipe) Run(ctx *context.Context) error { +// Publish signs and pushes the docker images signatures. +func (DockerPipe) Publish(ctx *context.Context) error { if ctx.SkipSign { return pipe.ErrSkipSignEnabled } diff --git a/internal/pipe/sign/sign_docker_test.go b/internal/pipe/sign/sign_docker_test.go index 8d037decf0b..42e41ef63cf 100644 --- a/internal/pipe/sign/sign_docker_test.go +++ b/internal/pipe/sign/sign_docker_test.go @@ -33,21 +33,21 @@ func TestDockerSignDisabled(t *testing.T) { ctx.Config.DockerSigns = []config.Sign{ {Artifacts: "none"}, } - err := DockerPipe{}.Run(ctx) + err := DockerPipe{}.Publish(ctx) require.EqualError(t, err, "artifact signing is disabled") } func TestDockerSignSkipped(t *testing.T) { ctx := context.New(config.Project{}) ctx.SkipSign = true - err := DockerPipe{}.Run(ctx) + err := DockerPipe{}.Publish(ctx) require.EqualError(t, err, "artifact signing is disabled") } func TestDockerSignSkipPublish(t *testing.T) { ctx := context.New(config.Project{}) ctx.SkipPublish = true - err := DockerPipe{}.Run(ctx) + err := DockerPipe{}.Publish(ctx) require.EqualError(t, err, "artifact signing is disabled") } @@ -56,7 +56,7 @@ func TestDockerSignInvalidArtifacts(t *testing.T) { ctx.Config.DockerSigns = []config.Sign{ {Artifacts: "foo"}, } - err := DockerPipe{}.Run(ctx) + err := DockerPipe{}.Publish(ctx) require.EqualError(t, err, "invalid list of artifacts to sign: foo") } @@ -178,7 +178,7 @@ func TestDockerSignArtifacts(t *testing.T) { }) require.NoError(t, DockerPipe{}.Default(ctx)) - require.NoError(t, DockerPipe{}.Run(ctx)) + require.NoError(t, DockerPipe{}.Publish(ctx)) var sigs []string for _, sig := range ctx.Artifacts.Filter(artifact.ByType(artifact.Signature)).List() { sigs = append(sigs, sig.Name) diff --git a/internal/pipeline/pipeline.go b/internal/pipeline/pipeline.go index bf8239e296a..66413eb734b 100644 --- a/internal/pipeline/pipeline.go +++ b/internal/pipeline/pipeline.go @@ -5,10 +5,6 @@ import ( "fmt" "github.com/goreleaser/goreleaser/internal/pipe/announce" - "github.com/goreleaser/goreleaser/internal/pipe/gomod" - "github.com/goreleaser/goreleaser/internal/pipe/semver" - "github.com/goreleaser/goreleaser/internal/pipe/sourcearchive" - "github.com/goreleaser/goreleaser/internal/pipe/archive" "github.com/goreleaser/goreleaser/internal/pipe/before" "github.com/goreleaser/goreleaser/internal/pipe/build" @@ -20,11 +16,14 @@ import ( "github.com/goreleaser/goreleaser/internal/pipe/effectiveconfig" "github.com/goreleaser/goreleaser/internal/pipe/env" "github.com/goreleaser/goreleaser/internal/pipe/git" + "github.com/goreleaser/goreleaser/internal/pipe/gomod" "github.com/goreleaser/goreleaser/internal/pipe/nfpm" "github.com/goreleaser/goreleaser/internal/pipe/publish" + "github.com/goreleaser/goreleaser/internal/pipe/semver" "github.com/goreleaser/goreleaser/internal/pipe/sign" "github.com/goreleaser/goreleaser/internal/pipe/snapcraft" "github.com/goreleaser/goreleaser/internal/pipe/snapshot" + "github.com/goreleaser/goreleaser/internal/pipe/sourcearchive" "github.com/goreleaser/goreleaser/pkg/context" ) @@ -64,6 +63,5 @@ var Pipeline = append( sign.Pipe{}, // sign artifacts docker.Pipe{}, // create and push docker images publish.Pipe{}, // publishes artifacts - sign.DockerPipe{}, // sign docker images and manifests announce.Pipe{}, // announce releases )