From b76149925ed775b12aa3b3abde406b6169af3479 Mon Sep 17 00:00:00 2001 From: neilotoole Date: Sun, 20 Aug 2023 08:14:28 -0600 Subject: [PATCH] test goreleaser update --- .github/workflows/main.yml | 8 ++++---- .goreleaser.yml | 30 ++++++++++++++++-------------- go.mod | 3 --- go.sum | 5 ----- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1bc1be1..7759ca9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: with: distribution: goreleaser-pro version: ${{ env.GORELEASER_VERSION }} - args: build --skip-validate --rm-dist -f .goreleaser-darwin.yml + args: build --skip-validate --clean -f .goreleaser-darwin.yml env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} @@ -174,7 +174,7 @@ jobs: with: distribution: goreleaser-pro version: ${{ env.GORELEASER_VERSION }} - args: build --skip-validate --rm-dist -f .goreleaser-linux-amd64.yml + args: build --skip-validate --clean -f .goreleaser-linux-amd64.yml env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} @@ -210,7 +210,7 @@ jobs: with: distribution: goreleaser-pro version: ${{ env.GORELEASER_VERSION }} - args: build --skip-validate --rm-dist -f .goreleaser-linux-arm64.yml + args: build --skip-validate --clean -f .goreleaser-linux-arm64.yml env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} @@ -242,7 +242,7 @@ jobs: with: distribution: goreleaser-pro version: ${{ env.GORELEASER_VERSION }} - args: build --skip-validate --rm-dist -f .goreleaser-windows.yml + args: build --skip-validate --clean -f .goreleaser-windows.yml env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 5f47e3c2..7dd231f6 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -24,9 +24,11 @@ builds: archives: - - name_template: "{{.ProjectName}}-{{ .Version }}-{{.Os}}-{{.Arch}}" - replacements: - darwin: macos +# name_template: "{{.ProjectName}}-{{ .Version }}-{{.Os}}-{{.Arch}}" + name_template: >- + {{.ProjectName}}-{{ .Version }}-{{- if eq .Os "darwin" }}macos{{- else }}{{ .Arch }}{{ end }}-{{.Arch}} +# replacements: +# darwin: macos format_overrides: - goos: windows format: zip @@ -56,7 +58,7 @@ brews: homepage: "https://github.com/neilotoole/sq" description: "sq data wrangler" license: MIT - tap: + repository: owner: neilotoole name: homebrew-sq @@ -73,16 +75,16 @@ brews: test: | system "#{bin}/sq --version" -scoop: - bucket: - owner: neilotoole - name: sq - homepage: "https://sq.io" - description: "sq data wrangler" - license: MIT - commit_author: - name: neilotoole - email: neilotoole@apache.org +scoops: + - repository: + owner: neilotoole + name: sq + homepage: "https://sq.io" + description: "sq data wrangler" + license: MIT + commit_author: + name: neilotoole + email: neilotoole@apache.org nfpms: - diff --git a/go.mod b/go.mod index a97cce29..34c3951d 100644 --- a/go.mod +++ b/go.mod @@ -56,8 +56,6 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/divan/gobenchui v0.0.0-20160226094309-a6b1cf870779 // indirect - github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/huandu/xstrings v1.4.0 // indirect @@ -86,7 +84,6 @@ require ( golang.org/x/crypto v0.12.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - golang.org/x/tools v0.6.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gopkg.in/djherbis/atime.v1 v1.0.0 // indirect gopkg.in/djherbis/stream.v1 v1.3.1 // indirect diff --git a/go.sum b/go.sum index 73aaf641..517f328d 100644 --- a/go.sum +++ b/go.sum @@ -24,16 +24,12 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/divan/gobenchui v0.0.0-20160226094309-a6b1cf870779 h1:wgrJeFzkPSTYLvcWOWVviNoB5SlMDTP69g7Y3ZktPC8= -github.com/divan/gobenchui v0.0.0-20160226094309-a6b1cf870779/go.mod h1:gix3O5DZ9rD22k2gz4eeUa57uc/7RfTBBrIPQPv61nw= github.com/djherbis/fscache v0.10.1 h1:hDv+RGyvD+UDKyRYuLoVNbuRTnf2SrA2K3VyR1br9lk= github.com/djherbis/fscache v0.10.1/go.mod h1:yyPYtkNnnPXsW+81lAcQS6yab3G2CRfnPLotBvtbf0c= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/ecnepsnai/osquery v1.0.1 h1:i96n/3uqcafKZtRYmXVNqekKbfrIm66q179mWZ/Y2Aw= github.com/ecnepsnai/osquery v1.0.1/go.mod h1:vxsezNRznmkLa8UjVh88tlJiRbgW7iwinkjyg/Xc2RU= -github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= -github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= @@ -265,7 +261,6 @@ golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=