From a3f790138eaeb1178629f023830538162781a9cf Mon Sep 17 00:00:00 2001
From: Joe Purdy <joe.purdy@arcadia.com>
Date: Wed, 9 Nov 2022 13:00:56 -0800
Subject: [PATCH] fix: more release tweaks to fix x86 builds

---
 .goreleaser.yaml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 832bd26..0935a55 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,11 +1,10 @@
 builds:
-  - id: linux-build
+  - id: linux-amd64-build
     binary: ax
     goos:
       - linux
     goarch:
       - amd64
-      - arm64
     # set the modified timestamp on the output binary to the git timestamp to ensure a reproducible build
     mod_timestamp: &build-timestamp '{{ .CommitTimestamp }}'
     env: &build-env
@@ -16,6 +15,16 @@ builds:
       -extldflags '-static'
       -X main.Version={{.Version}}
 
+  - id: linux-arm64-build
+    binary: ax
+    goos:
+      - linux
+    goarch:
+      - arm64
+    mod_timestamp: *build-timestamp
+    env: *build-env
+    ldflags: *build-ldflags
+
   - id: darwin-build
     binary: ax
     goos:
@@ -28,24 +37,23 @@ builds:
     ldflags: *build-ldflags
 
 universal_binaries:
-- ids:
-  - darwin-build
+- id: darwin-build
 - replace: true
 
 archives:
-  - id: linux-archives
-    builds:
-      - linux-build
-
-  - id: darwin-archives
+  - id: default-archive
     builds:
+      - linux-amd64-build
+      - linux-arm64-build
       - darwin-build
+    replacements:
+      darwin: macOS
+      amd64: x86_64
+      all: universal
 
 brews:
   - name: axolotl
 
-    goamd64: v3
-
     tap:
       owner: ArcadiaPower
       name: homebrew-tap