From cacab984b560466e5cddefd38805574abfa7173b Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Mon, 23 Sep 2024 14:21:33 +0200 Subject: [PATCH 1/3] ci: Match goreleaser version --- .github/workflows/go.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index aa8968c41..9774f75b1 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 --skip-publish --clean - name: Test S2 GOAMD64 v3 env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1a9ced64..3b75f14ae 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 From 9b4636a2f4374ecec0c33809693f5dfdcc67f7b5 Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Mon, 23 Sep 2024 14:25:48 +0200 Subject: [PATCH 2/3] Add version --- .goreleaser.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a22953805..fedb26004 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 From b735479b5759fed98ea2808aba196df818666718 Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Mon, 23 Sep 2024 14:33:59 +0200 Subject: [PATCH 3/3] blah --- .github/workflows/go.yml | 2 +- .goreleaser.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9774f75b1..911d5a2c1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -94,7 +94,7 @@ jobs: 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=v2.3.2 sh -s -- --snapshot --skip-publish --clean + run: curl -sL https://git.io/goreleaser | VERSION=v2.3.2 sh -s -- --snapshot --clean - name: Test S2 GOAMD64 v3 env: diff --git a/.goreleaser.yml b/.goreleaser.yml index fedb26004..4528059ca 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -99,7 +99,7 @@ archives: checksum: name_template: 'checksums.txt' snapshot: - name_template: "{{ .Tag }}-next" + version_template: "{{ .Tag }}-next" changelog: sort: asc filters: