Add ARM support (#56)

- Add ARM support
newrelic · Jun 10, 2021 · c8202e8 · c8202e8
1 parent 41a6070
commit c8202e8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.4.1 (2021-06-10)
+### Changed
+- Add ARM support.
+
 ## 2.4.0 (2021-05-05)
-## Changed
+### Changed
 - Update Go to v1.16.
 - Migrate to Go Modules
 - Update Infrastracture SDK to v3.6.7.

diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
@@ -30,65 +30,44 @@ builds:
       pre: build/windows/set_exe_properties.sh {{ .Env.TAG }} "couchbase"
 
 nfpms:
-  - id: nri-deb
-    builds:
-      - nri-nix
+  - id: linux
     file_name_template: "{{ .ProjectName }}_{{ .Version }}-1_{{ .Arch }}"
     vendor: "New Relic, Inc."
     homepage: "https://www.newrelic.com/infrastructure"
     maintainer: "New Relic Infrastructure Team <infrastructure-eng@newrelic.com>"
     description: "New Relic Infrastructure couchbase Integration extend the core New Relic\nInfrastructure agent's capabilities to allow you to collect metric and\nlive state data from couchbase components."
     license: "https://newrelic.com/terms (also see LICENSE installed with this package)"
-    # Formats to be generated.
-    formats:
-      - deb
-    bindir: "/var/db/newrelic-infra/newrelic-integrations/bin"
-    contents:
-      - src: couchbase-config.yml.sample
-        dst: /etc/newrelic-infra/integrations.d/couchbase-config.yml.sample
-      - src: CHANGELOG.md
-        dst: /usr/share/doc/nri-couchbase/CHANGELOG.md
-      - src: README.md
-        dst: /usr/share/doc/nri-couchbase/README.md
-      - src: LICENSE
-        dst: /usr/share/doc/nri-couchbase/LICENSE
-      - src: couchbase-definition.yml
-        dst: /var/db/newrelic-infra/newrelic-integrations/couchbase-definition.yml
-        type: config
-    dependencies:
-      - "newrelic-infra"
 
-  - id: nri-rpm
     builds:
       - nri-nix
-    file_name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}"
-    vendor: "New Relic, Inc."
-    homepage: "https://www.newrelic.com/infrastructure"
-    maintainer: "New Relic Infrastructure Team <infrastructure-eng@newrelic.com>"
-    description: "New Relic Infrastructure couchbase Integration extend the core New Relic\nInfrastructure agent's capabilities to allow you to collect metric and\nlive state data from couchbase components."
-    license: "https://newrelic.com/terms (also see LICENSE installed with this package)"
-    # Formats to be generated.
-    formats:
-      - rpm
+
+    dependencies:
+      - "newrelic-infra"
+
     bindir: "/var/db/newrelic-infra/newrelic-integrations/bin"
     contents:
-      - src: couchbase-config.yml.sample
-        dst: /etc/newrelic-infra/integrations.d/couchbase-config.yml.sample
-      - src: CHANGELOG.md
-        dst: /usr/share/doc/nri-couchbase/CHANGELOG.md
-      - src: README.md
-        dst: /usr/share/doc/nri-couchbase/README.md
-      - src: LICENSE
-        dst: /usr/share/doc/nri-couchbase/LICENSE
-      - src: couchbase-definition.yml
-        dst: /var/db/newrelic-infra/newrelic-integrations/couchbase-definition.yml
+      - src: "couchbase-config.yml.sample"
+        dst: "/etc/newrelic-infra/integrations.d/couchbase-config.yml.sample"
+      - src: "CHANGELOG.md"
+        dst: "/usr/share/doc/nri-couchbase/CHANGELOG.md"
+      - src: "README.md"
+        dst: "/usr/share/doc/nri-couchbase/README.md"
+      - src: "LICENSE"
+        dst: "/usr/share/doc/nri-couchbase/LICENSE"
+      - src: "couchbase-definition.yml"
+        dst: "/var/db/newrelic-infra/newrelic-integrations/couchbase-definition.yml"
         type: config
-    dependencies:
-      - "newrelic-infra"
+
     overrides:
       rpm:
+        file_name_template: "{{ .ProjectName }}-{{ .Version }}-1.{{ .Arch }}"
         replacements:
-          amd64: 1.x86_64
+          amd64: x86_64
+
+    # Formats to be generated.
+    formats:
+      - deb
+      - rpm
 
 archives:
   - id: nri-nix

diff --git a/build/release.mk b/build/release.mk
@@ -1,5 +1,5 @@
 BUILD_DIR    := ./bin/
-GORELEASER_VERSION := v0.154.0
+GORELEASER_VERSION := v0.169.0
 GORELEASER_BIN ?= bin/goreleaser
 
 bin: