From 13a1ce6df1e03c38e389e32b10b8cca2534612f0 Mon Sep 17 00:00:00 2001
From: Klaus Post <klauspost@gmail.com>
Date: Mon, 23 Sep 2024 06:15:16 -0700
Subject: [PATCH] ci: Match goreleaser version (#1009)

* ci: Match goreleaser version
---
 .github/workflows/go.yml      | 4 ++--
 .github/workflows/release.yml | 2 +-
 .goreleaser.yml               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index aa8968c41d..911d5a2c16 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -91,10 +91,10 @@ jobs:
       run: go build github.com/klauspost/compress/s2/cmd/s2c && go build github.com/klauspost/compress/s2/cmd/s2d&&./s2c -verify s2c &&./s2d s2c.s2&&rm ./s2c&&rm s2d&&rm s2c.s2
 
     - name: goreleaser deprecation
-      run: curl -sfL https://git.io/goreleaser | VERSION=v1.20.0 sh -s -- check
+      run: curl -sfL https://git.io/goreleaser | VERSION=v2.3.2 sh -s -- check
 
     - name: goreleaser snapshot
-      run: curl -sL https://git.io/goreleaser | VERSION=v1.20.0 sh -s -- --snapshot --skip-publish --rm-dist
+      run: curl -sL https://git.io/goreleaser | VERSION=v2.3.2 sh -s -- --snapshot --clean
 
     - name: Test S2 GOAMD64 v3
       env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c1a9ced644..3b75f14aef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
         with:
           version: 2.3.2
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CGO_ENABLED: 0
diff --git a/.goreleaser.yml b/.goreleaser.yml
index a22953805c..4528059ca6 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,5 +1,5 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
+version: 2
+
 before:
   hooks:
     - ./gen.sh
@@ -99,7 +99,7 @@ archives:
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters: