From ec6167b275eb1b56ccba3a69adfd7c6b7e1b5b8d Mon Sep 17 00:00:00 2001
From: Marc Szanto <11840265+Xemdo@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:51:00 -0700
Subject: [PATCH] Fixed deprecated gorelease flags

---
 .goreleaser.yml | 24 ++++++++++--------------
 Makefile        |  6 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 893590fa..acd1298e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -66,16 +66,17 @@ builds:
       - windows
     goarch:
       - "386" 
-scoop:
-  bucket:
-    owner: twitchdev
-    name: scoop-bucket
-  homepage: https://github.com/twitchdev/twitch-cli
-  description: CLI for Twitch's developer offerings
-  license: Apache-2.0
+scoops:
+  -
+    repository:
+      owner: twitchdev
+      name: scoop-bucket
+    homepage: https://github.com/twitchdev/twitch-cli
+    description: CLI for Twitch's developer offerings
+    license: Apache-2.0
 brews:
   -
-    tap:
+    repository:
       owner: twitchdev
       name: homebrew-twitch
     folder: Formula
@@ -87,12 +88,7 @@ brews:
       system "#{bin}/twitch", "version"
     license: Apache-2.0
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+  - name_template: '{{ .ProjectName }}_{{ .Version }}_{{- title .Os }}_{{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}'
     format_overrides:
     - goos: windows
       format: zip
diff --git a/Makefile b/Makefile
index f3dea073..dd5054fb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ release:
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-w /go/src/github.com/twitchdev/twitch-cli \
 		-e GITHUB_TOKEN=${GITHUB_TOKEN} \
-		twitch-cli:latest --rm-dist
+		twitch-cli:latest --clean
 
 test-release:
 	docker build . -t twitch-cli:latest
@@ -14,7 +14,7 @@ test-release:
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-w /go/src/github.com/twitchdev/twitch-cli \
 		-e GITHUB_TOKEN=${GITHUB_TOKEN} \
-		twitch-cli:latest --rm-dist --skip-publish --snapshot
+		twitch-cli:latest --clean --skip-publish --snapshot
 	
 build:
 	go build --ldflags "-s -w -X main.buildVersion=source"
@@ -23,4 +23,4 @@ build_all:
 	xgo -out build/twitch --targets "darwin/amd64,windows/amd64,linux/amd64" --ldflags "-s -w -X main.buildVersion=source" ./
 
 clean: 
-	rm -rf ~/.twitch-cli/eventCache.db
\ No newline at end of file
+	rm -rf ~/.twitch-cli/eventCache.db