From 0eba30eae86999fa0aa48f2c3f6d680805b07cbc Mon Sep 17 00:00:00 2001
From: Zach Leslie <zach.leslie@grafana.com>
Date: Thu, 28 Oct 2021 07:37:13 -0600
Subject: [PATCH] Include tempo-cli in the release (#1086)

* Include tempo-cli in the release

* Update changelog
---
 .goreleaser.yml | 19 +++++++++++++++++++
 CHANGELOG.md    |  1 +
 Makefile        |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 171b36334c0..4b57bc841b8 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -37,6 +37,25 @@ builds:
       - -X main.Revision={{ .ShortCommit }}
       - -X main.Version={{ .Version }}
     mod_timestamp: '{{ .CommitTimestamp }}'
+  - id: "tempo-cli"
+    main: ./cmd/tempo-cli
+    binary: tempo-cli
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+    goarch:
+      - amd64
+    flags:
+      - -v
+      - -trimpath
+    ldflags:
+      - -s
+      - -w
+      - -X main.Branch={{ .Branch }}
+      - -X main.Revision={{ .ShortCommit }}
+      - -X main.Version={{ .Version }}
+    mod_timestamp: '{{ .CommitTimestamp }}'
 changelog:
   skip: true
   sort: asc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58c06caa737..f03dc28f4ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 * [ENHANCEMENT] Allow search disablement in vulture [#1069](https://github.com/grafana/tempo/pull/1069) (@zalegrala)
 * [ENHANCEMENT] Jsonnet: add `$._config.search_enabled`, correctly set `http_api_prefix` in config [#1072](https://github.com/grafana/tempo/pull/1072) (@kvrhdn)
 * [ENHANCEMENT] Performance: Remove WAL contention between ingest and searches [#1076](https://github.com/grafana/tempo/pull/1076) (@mdisibio)
+* [ENHANCEMENT] Include tempo-cli in the release [#1086](https://github.com/grafana/tempo/pull/1086) (@zalegrala)
 * [BUGFIX] Update port spec for GCS docker-compose example [#869](https://github.com/grafana/tempo/pull/869) (@zalegrala)
 * [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https://github.com/grafana/tempo/issues/937) (@mdisibio)
 * [BUGFIX] Fix compactor memory leak [#806](https://github.com/grafana/tempo/pull/806) (@mdisibio)
diff --git a/Makefile b/Makefile
index f5c316b1ca1..68a4ebf6362 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,9 @@ release: $(GORELEASER)
 	$(GORELEASER) build --skip-validate --rm-dist
 	$(GORELEASER) release --rm-dist
 
+release-snapshot: $(GORELEASER)
+	$(GORELEASER) build --skip-validate --rm-dist --snapshot
+
 ### Docs
 DOCS_IMAGE = grafana/docs-base:latest