From c6851f5eee7c54f128c62c1788da541acabb7a06 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sat, 17 Jun 2023 23:23:14 +0000 Subject: [PATCH] fix(nix): hc should report nix-prefetch-url as a dependency Signed-off-by: Carlos Alexandro Becker --- internal/pipe/nix/nix.go | 3 ++- internal/pipe/nix/nix_test.go | 4 ++++ pkg/healthcheck/healthcheck.go | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/pipe/nix/nix.go b/internal/pipe/nix/nix.go index 4ef1652d6..f1280618c 100644 --- a/internal/pipe/nix/nix.go +++ b/internal/pipe/nix/nix.go @@ -55,7 +55,8 @@ type Pipe struct { prefetcher shaPrefetcher } -func (Pipe) String() string { return "nixpkgs" } +func (Pipe) String() string { return "nixpkgs" } +func (Pipe) Dependencies(_ *context.Context) []string { return []string{"nix-prefetch-url"} } func (p Pipe) Skip(ctx *context.Context) bool { return len(ctx.Config.Nix) == 0 || !p.prefetcher.Available() } diff --git a/internal/pipe/nix/nix_test.go b/internal/pipe/nix/nix_test.go index b74c1aa51..54705ae70 100644 --- a/internal/pipe/nix/nix_test.go +++ b/internal/pipe/nix/nix_test.go @@ -414,6 +414,10 @@ func TestErrNoArchivesFound(t *testing.T) { }, "no archives found matching goos=[darwin linux] goarch=[amd64 arm arm64 386] goarm=[6 7] goamd64=v1 ids=[foo bar]") } +func TestDependencies(t *testing.T) { + require.Equal(t, []string{"nix-prefetch-url"}, Pipe{}.Dependencies(nil)) +} + type fakeNixShaPrefetcher map[string]string func (m fakeNixShaPrefetcher) Prefetch(url string) (string, error) { diff --git a/pkg/healthcheck/healthcheck.go b/pkg/healthcheck/healthcheck.go index 52dab1de8..c9009281f 100644 --- a/pkg/healthcheck/healthcheck.go +++ b/pkg/healthcheck/healthcheck.go @@ -7,6 +7,7 @@ import ( "github.com/goreleaser/goreleaser/internal/pipe/chocolatey" "github.com/goreleaser/goreleaser/internal/pipe/docker" + "github.com/goreleaser/goreleaser/internal/pipe/nix" "github.com/goreleaser/goreleaser/internal/pipe/sbom" "github.com/goreleaser/goreleaser/internal/pipe/sign" "github.com/goreleaser/goreleaser/internal/pipe/snapcraft" @@ -32,6 +33,7 @@ var Healthcheckers = []Healthchecker{ docker.Pipe{}, docker.ManifestPipe{}, chocolatey.Pipe{}, + nix.NewPublish(), } type system struct{}