mirror of
https://github.com/goreleaser/goreleaser.git
synced 2025-01-04 03:11:55 +02:00
fix: merge issues
This commit is contained in:
parent
1b8395d6b6
commit
f05f3b5b7f
@ -170,7 +170,7 @@ func (*Builder) Build(ctx *context.Context, build config.Build, options api.Opti
|
||||
testEnvs := []string{}
|
||||
env = append(env, ctx.Env.Strings()...)
|
||||
for _, e := range details.Env {
|
||||
ee, err := tmpl.New(ctx).WithEnvS(env).WithArtifact(a, nil).Apply(e)
|
||||
ee, err := tmpl.New(ctx).WithEnvS(env).WithArtifact(a).Apply(e)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -280,7 +280,7 @@ func doBuildFormula(ctx *context.Context, data templateData) (string, error) {
|
||||
}
|
||||
|
||||
func installs(ctx *context.Context, cfg config.Homebrew, art *artifact.Artifact) ([]string, error) {
|
||||
applied, err := tmpl.New(ctx).WithArtifact(art, nil).Apply(cfg.Install)
|
||||
applied, err := tmpl.New(ctx).WithArtifact(art).Apply(cfg.Install)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user