Revert "Update .goreleaser.yaml" (#1886)

* Revert "Update .goreleaser.yaml (#1884)"

This reverts commit ec76547.

* Update preflight.yaml

* Update .goreleaser.yaml

Author: NoaheCampbell

deploy/.goreleaser.yaml

@@ -3,6 +3,7 @@ project_name: troubleshoot
 
 release:
   prerelease: auto
+  mode: keep-existing
 
 builds:
   - id: preflight
@@ -13,8 +14,6 @@ builds:
     ignore:
       - goos: windows
         goarch: arm
-      - goos: darwin
-        goarch: arm
     ldflags:
       - -s -w
       - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{ .Version }}
@@ -38,8 +37,6 @@ builds:
     ignore:
       - goos: windows
         goarch: arm
-      - goos: darwin
-        goarch: arm
     ldflags:
       - -s -w
       - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{ .Version }}
@@ -95,7 +92,39 @@ archives:
         dst: .
         strip_parent: true
 
-  
+  - id: preflight-universal
+    ids: [preflight-universal]
+    formats: [tar.gz]
+    name_template: "preflight_{{ .Os }}_{{ .Arch }}"
+    files:
+      - licence*
+      - LICENCE*
+      - license*
+      - LICENSE*
+      - readme*
+      - README*
+      - changelog*
+      - CHANGELOG*
+      - src: "sbom/assets/*"
+        dst: .
+        strip_parent: true
+
+  - id: support-bundle-universal
+    ids: [support-bundle-universal]
+    formats: [tar.gz]
+    name_template: "support-bundle_{{ .Os }}_{{ .Arch }}"
+    files:
+      - licence*
+      - LICENCE*
+      - license*
+      - LICENSE*
+      - readme*
+      - README*
+      - changelog*
+      - CHANGELOG*
+      - src: "sbom/assets/*"
+        dst: .
+        strip_parent: true
 
 dockers:
   - dockerfile: ./deploy/Dockerfile.troubleshoot
@@ -119,11 +148,20 @@ dockers:
       - preflight
     skip_push: true
 
- 
+universal_binaries:
+  - id: preflight-universal
+    ids: [preflight]        # refers to the build id above
+    replace: true
+    name_template: preflight
+
+  - id: support-bundle-universal
+    ids: [support-bundle]   # refers to the build id above
+    replace: true
+    name_template: support-bundle
 
 brews:
   - name: preflight
-    ids: [preflight]
+    ids: [preflight, preflight-universal]
     homepage: https://docs.replicated.com/reference/preflight-overview/
     description: "A preflight checker and conformance test for Kubernetes clusters."
     repository:
@@ -133,7 +171,7 @@ brews:
     directory: HomebrewFormula
     install: bin.install "preflight"
   - name: support-bundle
-    ids: [support-bundle]
+    ids: [support-bundle, support-bundle-universal]
     homepage: https://docs.replicated.com/reference/support-bundle-overview/
     description: "Collect and redact support bundles for Kubernetes clusters."
     repository:

deploy/krew/preflight.yaml

@@ -42,7 +42,7 @@ spec:
       matchLabels:
         os: darwin
         arch: amd64
-    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_darwin_amd64.tar.gz" .TagName }}
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_darwin_all.tar.gz" .TagName }}
     files:
     - from: preflight
       to: .
@@ -53,7 +53,7 @@ spec:
       matchLabels:
         os: darwin
         arch: arm64
-    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_darwin_arm64.tar.gz" .TagName }}
+    {{addURIAndSha "https://github.com/replicatedhq/troubleshoot/releases/download/{{ .TagName }}/preflight_darwin_all.tar.gz" .TagName }}
     files:
     - from: preflight
       to: .