From 6886b9387d77da3930e87c769c4c6a48598880a0 Mon Sep 17 00:00:00 2001
From: Adam Becevello <adam.becevello@shopify.com>
Date: Tue, 8 Oct 2024 10:59:14 -0400
Subject: [PATCH] Replace deprecated goreleaser options with version 2
 replacements

---
 .github/workflows/release.yml | 2 +-
 .github/workflows/test.yml    | 2 +-
 .goreleaser.yml               | 1 +
 Makefile                      | 4 ++--
 scripts/test-release          | 6 +++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b37418db..d2aea3a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,6 +73,6 @@ jobs:
         with:
           distribution: goreleaser
           version: v1.10.3
-          args: release --rm-dist --release-notes=tmp/release_changelog.md
+          args: release --clean --release-notes=tmp/release_changelog.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05be891d..84feb919 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,6 +58,6 @@ jobs:
         with:
           distribution: goreleaser
           version: v1.10.3
-          args: build --snapshot --rm-dist --skip-post-hooks --skip-validate --single-target
+          args: build --snapshot --clean --skip=post-hooks,validate --single-target
         env:
           GOOS: linux
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 8cfd1555..a45c5337 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,4 +1,5 @@
 ---
+version: 2
 
 project_name: toxiproxy
 
diff --git a/Makefile b/Makefile
index 9891c3bc..5b2fa911 100644
--- a/Makefile
+++ b/Makefile
@@ -56,11 +56,11 @@ container.build:
 
 .PHONY: release
 release:
-	goreleaser release --rm-dist
+	goreleaser release --clean
 
 .PHONY: release-dry
 release-dry:
-	goreleaser release --rm-dist --skip-publish --skip-validate
+	goreleaser release --clean --skip=publish,validate
 
 .PHONY: setup
 setup:
diff --git a/scripts/test-release b/scripts/test-release
index 74f87466..f41e0470 100755
--- a/scripts/test-release
+++ b/scripts/test-release
@@ -9,7 +9,7 @@ if [ "${ARCH}" == "x86_64" ]; then
   ARCH="amd64"
 fi
 
-goreleaser release --rm-dist --skip-publish --skip-validate
+goreleaser release --clean --skip=publish,validate
 
 docker run -v "$(PWD)"/dist:/dist --pull always --rm -it ubuntu bash -c \
   "set -xe;
@@ -47,13 +47,13 @@ docker run -v "$(PWD)"/dist:/dist --pull always --rm -it alpine sh -c \
 tar -ztvf dist/toxiproxy_*_linux_amd64.tar.gz | grep -o -e toxiproxy-server
 tar -ztvf dist/toxiproxy_*_linux_amd64.tar.gz | grep -o -e toxiproxy-cli
 
-goreleaser build --rm-dist --single-target --skip-validate --id server
+goreleaser build --clean --single-target --skip=validate --id server
 bineries=(./dist/toxiproxy-server-*)
 server="${bineries[0]}"
 $server --help 2>&1 | grep -o -e "Usage of ./dist/toxiproxy-server"
 $server --version | grep -o -e "toxiproxy-server version ${VERSION}"
 
-goreleaser build --rm-dist --single-target --skip-validate --id client
+goreleaser build --clean --single-target --skip=validate --id client
 bineries=(./dist/toxiproxy-cli-*)
 cli="${bineries[0]}"
 $cli --help 2>&1 |