From e1f6f36804a0727da69cbc82a2a1666b06429d7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 00:08:41 +0300 Subject: [PATCH] chore(deps): bump github.com/goreleaser/goreleaser in /tools (#102) --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- tools/vendor/github.com/goreleaser/goreleaser/Dockerfile | 2 +- .../github.com/goreleaser/goreleaser/internal/pipe/aur/aur.go | 1 + .../goreleaser/goreleaser/internal/pipe/aur/tmpl.go | 3 ++- tools/vendor/modules.txt | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 5383eb3d..f4dbcea2 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/axw/gocov v1.0.0 github.com/golangci/golangci-lint v1.44.2 - github.com/goreleaser/goreleaser v1.6.1 + github.com/goreleaser/goreleaser v1.6.3 github.com/matm/gocov-html v0.0.0-20200509184451-71874e2e203b github.com/mattn/goveralls v0.0.11 github.com/obalunenko/coverbadger v1.1.0 diff --git a/tools/go.sum b/tools/go.sum index 86477ede..87d235ab 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -647,8 +647,8 @@ github.com/goreleaser/chglog v0.1.2 h1:tdzAb/ILeMnphzI9zQ7Nkq+T8R9qyXli8GydD8plF github.com/goreleaser/chglog v0.1.2/go.mod h1:tTZsFuSZK4epDXfjMkxzcGbrIOXprf0JFp47BjIr3B8= 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/goreleaser v1.6.1 h1:FzbmxtKCu+/R4dC1Yf3DR/VpBN8jBA2O2X11465LxE4= -github.com/goreleaser/goreleaser v1.6.1/go.mod h1:GNAzFVZsES0XQyspLpg0pYMRTAeC2wmNejmmxF9r90g= +github.com/goreleaser/goreleaser v1.6.3 h1:LqHfNmaqGoC7OuabK/UeINWyuQaqm/jdotsALhk0zsE= +github.com/goreleaser/goreleaser v1.6.3/go.mod h1:GNAzFVZsES0XQyspLpg0pYMRTAeC2wmNejmmxF9r90g= github.com/goreleaser/nfpm/v2 v2.14.0 h1:1xFq1F1Dy3HSdbjUtd+8CCahxLNlQwylcHwoLOg/lW0= github.com/goreleaser/nfpm/v2 v2.14.0/go.mod h1:46Gk7U5PrLL34NxrsorlkiavoX5gwyGOYQSMaPn5xdw= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= diff --git a/tools/vendor/github.com/goreleaser/goreleaser/Dockerfile b/tools/vendor/github.com/goreleaser/goreleaser/Dockerfile index 94fbd7d3..20b6f51b 100644 --- a/tools/vendor/github.com/goreleaser/goreleaser/Dockerfile +++ b/tools/vendor/github.com/goreleaser/goreleaser/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.7-alpine +FROM golang:1.17.8-alpine RUN apk add --no-cache bash \ curl \ diff --git a/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/aur.go b/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/aur.go index b045ca23..a1598141 100644 --- a/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/aur.go +++ b/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/aur.go @@ -312,6 +312,7 @@ func dataFor(ctx *context.Context, cfg config.AUR, cl client.Client, artifacts [ DownloadURL: url, SHA256: sum, Arch: toPkgBuildArch(art.Goarch + art.Goarm), + Format: art.ExtraOr(artifact.ExtraFormat, "").(string), } result.ReleasePackages = append(result.ReleasePackages, releasePackage) result.Arches = append(result.Arches, releasePackage.Arch) diff --git a/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/tmpl.go b/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/tmpl.go index afb97112..55a42413 100644 --- a/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/tmpl.go +++ b/tools/vendor/github.com/goreleaser/goreleaser/internal/pipe/aur/tmpl.go @@ -22,6 +22,7 @@ type releasePackage struct { DownloadURL string SHA256 string Arch string + Format string } const aurTemplateData = `# This file was generated by GoReleaser. DO NOT EDIT. @@ -54,7 +55,7 @@ optdepends=({{ pkgArray . }}) {{- end }} {{ range .ReleasePackages -}} -source_{{ .Arch }}=('{{ .DownloadURL }}') +source_{{ .Arch }}=("${pkgname}_${pkgver}_{{ .Arch }}.{{ .Format }}::{{ .DownloadURL }}") sha256sums_{{ .Arch }}=('{{ .SHA256 }}') {{ printf "" }} {{ end }} diff --git a/tools/vendor/modules.txt b/tools/vendor/modules.txt index e060bf0a..a90c9233 100644 --- a/tools/vendor/modules.txt +++ b/tools/vendor/modules.txt @@ -687,7 +687,7 @@ github.com/goreleaser/chglog # github.com/goreleaser/fileglob v1.3.0 ## explicit; go 1.16 github.com/goreleaser/fileglob -# github.com/goreleaser/goreleaser v1.6.1 +# github.com/goreleaser/goreleaser v1.6.3 ## explicit; go 1.17 github.com/goreleaser/goreleaser github.com/goreleaser/goreleaser/cmd