From 15618d11874d8f95ffcf10f7cccb013d13e190d6 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 11 Jul 2023 01:15:16 +0800 Subject: [PATCH] Remove `archives.replacements` in `goreleaser.yaml` (#1895) * fix: update name template in goreleaser * fix: add arm version * fix: space * fix: --clean --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .github/workflows/checks.yml | 2 +- .github/workflows/release.yml | 2 +- .goreleaser.yml | 14 +++++++------- Makefile | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d21b0e3d..76757a94 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -108,7 +108,7 @@ jobs: uses: goreleaser/goreleaser-action@v4 with: version: latest - args: release --snapshot --rm-dist + args: release --snapshot --clean - name: Capture x86_64 (64-bit) Linux binary if: ${{ !env.ACT }} uses: actions/upload-artifact@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d990730d..dd053ca8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: uses: goreleaser/goreleaser-action@v4 with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }} - name: Chocolatey diff --git a/.goreleaser.yml b/.goreleaser.yml index 21a62685..e3cdde20 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -22,13 +22,13 @@ builds: checksum: name_template: 'checksums.txt' archives: - - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}' - replacements: - darwin: Darwin - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 + - name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} format_overrides: - goos: windows format: zip diff --git a/Makefile b/Makefile index 5929090a..97a57f7b 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ endif .PHONY: snapshot snapshot: goreleaser build \ - --rm-dist \ + --clean \ --single-target \ --snapshot