chore: Update goreleaser (#2233)

kubeshop · Mar 22, 2023 · 479cce0 · 479cce0
1 parent 02160a7
commit 479cce0
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 16 deletions.
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
@@ -79,7 +79,7 @@ jobs:
       - uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: release --clean --skip-announce -f .goreleaser.dev.yaml
         env:
           VERSION: ${{ github.ref_name}}-demo

diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -85,7 +85,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: release --clean --split --nightly
         env:
           GOOS: ${{ matrix.GOOS }}
@@ -145,7 +145,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: continue --merge
         env:
           VERSION: sha-${{ env.sha_short }}

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -101,7 +101,7 @@ jobs:
       uses: goreleaser/goreleaser-action@v4
       with:
         distribution: goreleaser-pro
-        version: v1.16.1
+        version: v1.16.2
         args: build --single-target --clean --snapshot
       env:
         VERSION: pr-${{ github.event.pull_request.number }}
@@ -175,7 +175,7 @@ jobs:
       - uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: release --clean --skip-announce --snapshot -f .goreleaser.dev.yaml
         env:
           VERSION: pr-${{ github.event.pull_request.number }}

diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -82,7 +82,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: release --clean -f .goreleaser.rc.yaml
         env:
           VERSION: ${{ github.ref_name}}

diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml
@@ -93,7 +93,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           distribution: goreleaser-pro
-          version: v1.16.1
+          version: v1.16.2
           args: release --clean
         env:
           VERSION: ${{ github.ref_name}}

diff --git a/.goreleaser.rc.yaml b/.goreleaser.rc.yaml
@@ -107,8 +107,15 @@ docker_manifests:
   - 'kubeshop/tracetest:{{ .Env.VERSION }}-arm64'
 
 archives:
-- replacements:
-    386: i386
+- name_template: >-
+    {{ .ProjectName }}_
+    {{- .Version }}_
+    {{- .Os }}_
+    {{- if eq .Arch "386" }}i386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- with .Arm }}v{{ . }}{{ end }}
+    {{- with .Mips }}_{{ . }}{{ end }}
+    {{- if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
 checksum:
   name_template: 'checksums.txt'
 
@@ -123,8 +130,15 @@ nfpms:
   formats:
     - deb
     - rpm
-  replacements:
-    386: i386
+  file_name_template: >-
+    {{ .ProjectName }}_
+    {{- .Version }}_
+    {{- .Os }}_
+    {{- if eq .Arch "386" }}i386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- with .Arm }}v{{ . }}{{ end }}
+    {{- with .Mips }}_{{ . }}{{ end }}
+    {{- if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
   deb:
     lintian_overrides:
       - statically-linked-binary
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -119,8 +119,15 @@ docker_manifests:
   - 'kubeshop/tracetest:{{ .Env.VERSION }}-arm64'
 
 archives:
-- replacements:
-    386: i386
+- name_template: >-
+    {{ .ProjectName }}_
+    {{- .Version }}_
+    {{- .Os }}_
+    {{- if eq .Arch "386" }}i386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- with .Arm }}v{{ . }}{{ end }}
+    {{- with .Mips }}_{{ . }}{{ end }}
+    {{- if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
 checksum:
   name_template: 'checksums.txt'
 
@@ -135,8 +142,15 @@ nfpms:
   formats:
     - deb
     - rpm
-  replacements:
-    386: i386
+  file_name_template: >-
+    {{ .ProjectName }}_
+    {{- .Version }}_
+    {{- .Os }}_
+    {{- if eq .Arch "386" }}i386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- with .Arm }}v{{ . }}{{ end }}
+    {{- with .Mips }}_{{ . }}{{ end }}
+    {{- if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
   deb:
     lintian_overrides:
       - statically-linked-binary

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PROJECT_ROOT=${PWD}
 
-GORELEASER_VERSION=1.16.1-pro
+GORELEASER_VERSION=1.16.2-pro
 CURRENT_GORELEASER_VERSION := $(shell goreleaser --version | head -n 1 | cut -d' ' -f3-)
 goreleaser-version:
 ifneq "$(CURRENT_GORELEASER_VERSION)" "$(GORELEASER_VERSION)"