From 6a60a55ba5223993f4f71d862b49d1501043dfde Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Tue, 4 Dec 2018 10:25:59 -0700 Subject: [PATCH] rename 'make goreleaser' to 'make release', remove obsolete targets Signed-off-by: Steve Kriss --- Makefile | 28 +++------------------------- changelogs/unreleased/1114-skriss | 1 + 2 files changed, 4 insertions(+), 25 deletions(-) create mode 100644 changelogs/unreleased/1114-skriss diff --git a/Makefile b/Makefile index 3244f9a69..b31db37d5 100644 --- a/Makefile +++ b/Makefile @@ -196,30 +196,6 @@ endif update: @$(MAKE) shell CMD="-c 'hack/update-all.sh'" -release: all-tar-bin checksum - -checksum: - @cd _output/release; \ - sha256sum *.tar.gz > CHECKSUM; \ - cat CHECKSUM; \ - sha256sum CHECKSUM - -all-tar-bin: $(addprefix tar-bin-, $(CLI_PLATFORMS)) - -tar-bin-%: - $(MAKE) ARCH=$* VERSION=$(VERSION) tar-bin - -GIT_DESCRIBE = $(shell git describe --tags --always --dirty) -tar-bin: build - mkdir -p _output/release - -# We do the subshell & wildcard ls so we can pick up $(BIN).exe for windows - (cd _output/bin/$(GOOS)/$(GOARCH) && ls $(BIN)*) | \ - tar \ - -C _output/bin/$(GOOS)/$(GOARCH) \ - --files-from=- \ - -zcf _output/release/$(BIN)-$(GIT_DESCRIBE)-$(GOOS)-$(GOARCH).tar.gz - build-dirs: @mkdir -p _output/bin/$(GOOS)/$(GOARCH) @mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH) .go/go-build @@ -233,7 +209,9 @@ clean: docker rmi $(BUILDER_IMAGE) ci: all verify test + changelog: hack/changelog.sh -goreleaser: + +release: hack/goreleaser.sh diff --git a/changelogs/unreleased/1114-skriss b/changelogs/unreleased/1114-skriss new file mode 100644 index 000000000..f6c431c37 --- /dev/null +++ b/changelogs/unreleased/1114-skriss @@ -0,0 +1 @@ +Remove obsolete make targets and rename 'make goreleaser' to 'make release'