From 6f2c2bc810dc46d1ef7f9a399d6ba9d198321a36 Mon Sep 17 00:00:00 2001
From: Barnaby Gray <barnaby@pickle.me.uk>
Date: Thu, 23 Feb 2023 13:15:17 +0000
Subject: [PATCH] Update goreleaser v1.15.2

---
 .github/workflows/release.yml |  6 +++++-
 .goreleaser.yml               | 12 ++----------
 Makefile                      |  3 ---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd5df9df..41bb7def 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,6 +25,10 @@ jobs:
       run: sudo apt install -y upx
 
     - name: Make release
-      run: curl -sL https://git.io/goreleaser | VERSION=v0.34.2 bash
+      uses: goreleaser/goreleaser-action@v4
+      with:
+        distribution: goreleaser
+        version: v1.15.2
+        args: release --clean
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index ee1a02f2..229aa50e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -8,16 +8,8 @@ builds:
       - windows
     goarch:
       - amd64
-      - 386
       - arm
       - arm64
-    ignore:
-      - goos: darwin
-        goarch: 386
-    hooks:
-      post: make upx
-archive:
-  name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
+archives:
+- name_template: "{{ .ProjectName }}-{{ if .Os == \"darwin\" }}mac{{ else }}{{ .Os }}{{ end }}-{{ .Arch }}"
   format: binary
-  replacements:
-    darwin: mac
diff --git a/Makefile b/Makefile
index a07dc027..a42747f9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ build:
 install:
 	go install $(exe)
 
-upx:
-	upx dist/cli53-linux-386/cli53-linux-386 dist/cli53-linux-arm/cli53-linux-arm dist/cli53-windows-386/cli53-windows-386.exe
-
 test-unit:
 	go test