Build binaries via goreleaser (#977)

adam-stokes · mdelapenya · commit 1f692a79fe94 · 2021-04-22T12:32:38.000+02:00
This handles building for all supported architectures including running packr
for embedding the binary files.

This allows us to easily extend our release process for tagging official cli
releases, building in various package formats and publishing to different
package registries

Signed-off-by: Adam Stokes &lt;51892+adam-stokes@users.noreply.github.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 bin
 outputs
+dist/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -0,0 +1,37 @@
+# This is an example .goreleaser.yml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+env:
+  - GO111MODULE=on
+
+before:
+  hooks:
+    - go mod download
+    - go install github.com/gobuffalo/packr/v2/packr2
+    - cd cli && packr2
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    main: ./cli/main.go
+    binary: op
+archives:
+  - replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
diff --git a/Makefile b/Makefile
@@ -1,3 +1,10 @@
+# Get current directory of a Makefile: https://stackoverflow.com/a/23324703
+
+# Builds cli for all supported platforms
+.PHONY: build
+build:
+	goreleaser --snapshot --skip-publish --rm-dist
+
 .PHONY: clean
 clean: clean-workspace clean-docker
 
diff --git a/README.md b/README.md
@@ -19,6 +19,20 @@ This repository contains:
         - Redis
         - vSphere
 
+## Building
+
+This project utilizes `goreleaser` to build the cli binaries for all supported
+platforms. Please see [goreleaser installation](https://goreleaser.com/install/)
+for instructions on making that available to you.
+
+Once `goreleaser` is installed building the cli is as follows:
+
+```
+$ make build
+```
+
+This will put the built distribution inside of `dist` in the current working directory.
+
 ## Contributing
 
 ### pre-commit
diff --git a/cli/.gitignore b/cli/.gitignore
@@ -1,2 +1,3 @@
 op
 .github
+packrd
diff --git a/cli/Building.md b/cli/Building.md
diff --git a/cli/Makefile b/cli/Makefile
@@ -4,23 +4,8 @@ ROOT_DIR:=$(CURDIR)
 include ../commons.mk
 
 TEST_TIMEOUT?=5m
-
-GO_IMAGE?='golang'
-GO_VERSION='$(shell cat ../.go-version )'
-GO_IMAGE_TAG?='stretch'
-GOOS?='linux'
-GOARCH?='amd64'
 LOG_LEVEL?=INFO
 
-.PHONY: build
-build:
-	docker run --rm \
-		-v $(ROOT_DIR):/go/src/github.com/elastic/e2e-testing/cli \
-		-w /go/src/github.com/elastic/e2e-testing/cli \
-		-e TARGET_OS=$(GOOS) -e TARGET_ARCH=$(GOARCH) -e GO111MODULE=on \
-		$(GO_IMAGE):$(GO_VERSION)-$(GO_IMAGE_TAG) \
-		scripts/build-cli.sh
-
 .PHONY: install
 install:
 	go get -v -t ./...
diff --git a/cli/scripts/build-cli.sh b/cli/scripts/build-cli.sh
