Skip to content

Commit 8c635e1

Browse files
authored
deb: Add missing maintainer vendor and description (#323)
Adds the missing .deb metadata, and removes the need to build a docker image to run a release. Resolves #310. Signed-off-by: Marc Lopez <marc5.12@outlook.com>
1 parent e6f2ae0 commit 8c635e1

File tree

5 files changed

+19
-53
lines changed

5 files changed

+19
-53
lines changed

.goreleaser.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ archives:
3434
- README*
3535
- docs/*
3636
snapshot:
37-
name_template: SNAPSHOT-{{ .Commit }}
37+
name_template: "{{ .Version }}_SNAPSHOT_{{ .ShortCommit }}"
3838
nfpms:
3939
- file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
4040
license: Apache 2.0
41+
maintainer: Elastic Cloud
42+
vendor: Elastic
43+
description: ecctl is the CLI for the Elasticsearch Service and Elastic Cloud Enterprise APIs.
44+
homepage: https://www.elastic.co/guide/en/ecctl/current/index.html
4145
replacements:
4246
amd64: 64-bit
4347
"386": 32-bit

build/Dockerfile.goreleaser

Lines changed: 0 additions & 13 deletions
This file was deleted.

build/Makefile.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ endif
4040
@ git push -u $(REMOTE) $(VERSION)
4141

4242
## Releases a new version of ecctl, use SKIP_TAG=true to skip publishing a tag.
43-
release:
43+
release: deps
4444
@ test -s notes/$(VERSION).md || (echo "-> changelog file is missing, please create it with 'make changelog'"; exit 2)
4545
ifneq ($(SKIP_TAG),true)
4646
@ $(MAKE) tag
4747
endif
4848
@ echo "-> Releasing $(BINARY) $(VERSION)..."
4949
@ okta-awscli
50-
@ ./scripts/goreleaser release --skip-validate --rm-dist --release-notes=notes/$(VERSION).md
50+
@ $(GOBIN)/goreleaser release --skip-validate --rm-dist --release-notes=notes/$(VERSION).md
5151

5252
## Generates a changelog file in notes/$(VERSION) for the next release.
5353
changelog:
5454
@ echo "-> Generating $(BINARY) changelog $(VERSION)..."
5555
@ ./scripts/generate-changelog.sh
5656

5757
## Generates a snapshot of the potential release
58-
snapshot:
59-
@ ./scripts/goreleaser release --rm-dist --snapshot --skip-validate
58+
snapshot: deps
59+
@ $(GOBIN)/goreleaser release --rm-dist --snapshot --skip-validate

build/Makefile.deps

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ VERSION_GOLINT:=v0.0.0-20191125180803-fdd1cda4f05f
99
VERSION_GOLICENSER:=v0.3.0
1010
VERSION_GOLANGCILINT:=v1.23.8
1111
VERSION_GOBINDATA:=v0.0.0-20190711162640-ee3c2418e368
12+
VERSION_GORELEASER:=v0.136.0
1213

13-
deps: $(GOBIN)/gobin $(GOBIN)/golint $(GOBIN)/go-licenser $(GOBIN)/golangci-lint $(GOBIN)/go-bindata
14+
deps: $(GOBIN)/gobin $(GOBIN)/golint $(GOBIN)/go-licenser $(GOBIN)/golangci-lint $(GOBIN)/go-bindata $(GOBIN)/goreleaser
1415

1516
$(GOBIN):
1617
@ mkdir -p $(GOBIN)
@@ -59,3 +60,11 @@ $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA):
5960
$(GOBIN)/go-bindata: $(GOBIN)/gobin $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA) | $(GOBIN)
6061
@ echo "-> Installing go-bindata..."
6162
@ $(GOBIN)/gobin github.com/go-bindata/go-bindata/go-bindata@$(VERSION_GOBINDATA)
63+
64+
$(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER): | $(VERSION_DIR)
65+
@ rm -f $(VERSION_DIR)/.version-goreleaser-*
66+
@ echo $(VERSION_GORELEASER) > $(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER)
67+
68+
$(GOBIN)/goreleaser: $(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER) | $(GOBIN)
69+
@ echo "-> Installing goreleaser..."
70+
@ curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh| sh -s -- -b $(GOBIN) $(VERSION_GORELEASER)

scripts/goreleaser

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)