Fix/goreleaser builds (#5942)

* Fix typo in arm build

* Add osusergo build tag

(cherry picked from commit acef601)

# Conflicts:
#	.goreleaser.yaml

.goreleaser.yaml

@@ -83,14 +83,15 @@ builds:
       - -X github.com/cosmos/cosmos-sdk/version.AppName=osmosisd
       - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
       - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
-      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc
+      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc,osusergo
       - -w -s
       - -linkmode=external
       - -extldflags '-Wl,-z,muldefs -static -lm'
     tags:
       - netgo
       - ledger
       - muslc
+      - osusergo
 
   - id: osmosisd-linux-arm64
     main: ./cmd/osmosisd
@@ -112,14 +113,15 @@ builds:
       - -X github.com/cosmos/cosmos-sdk/version.AppName=osmosisd 
       - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} 
       - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
-      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc
+      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc,osusergo
       - -w -s
       - -linkmode=external
       - -extldflags '-Wl,-z,muldefs -static -lm'
     tags:
       - netgo
       - ledger
       - muslc
+      - osusergo
 
 universal_binaries:
   - id: osmosisd-darwin-universal
@@ -144,7 +146,13 @@ archives:
       - osmosisd-darwin-universal
       - osmosisd-linux-amd64
       - osmosisd-linux-arm64
+<<<<<<< HEAD
     name_template: "{{.ProjectName}}-{{ .Os }}-{{ .Arch }}"
+=======
+      - osmosisd-darwin-amd64
+      - osmosisd-darwin-arm64
+    name_template: "{{.ProjectName}}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
+>>>>>>> acef6013 (Fix/goreleaser builds (#5942))
     format: binary
     files:
       - none*