diff --git a/Makefile b/Makefile index 900ddccfe8a4e..a3c66f039b99f 100644 --- a/Makefile +++ b/Makefile @@ -707,13 +707,6 @@ $(RERUN): $(wildcard $(TOOLINGDIR)/cmd/rerun/*.go) RELEASE_NOTES_GEN := $(TOOLINGDIR)/bin/release-notes $(RELEASE_NOTES_GEN): $(wildcard $(TOOLINGDIR)/cmd/release-notes/*.go) cd $(TOOLINGDIR) && go build -o "$@" ./cmd/release-notes -# -# Downloads and builds changelog from source. -# PHONY is set so that we rely on Go's mod cache and not Make's cache. -# -CHANGELOG := $(TOOLINGDIR)/bin/changelog -$(CHANGELOG): - GOBIN=$(TOOLINGDIR)/bin go install github.com/gravitational/shared-workflows/tools/changelog@v1.0.0 .PHONY: tooling tooling: ensure-gotestsum $(DIFF_TEST) @@ -1643,14 +1636,15 @@ rustup-install-target-toolchain: rustup-set-version # changelog generates PR changelog between the provided base tag and the tip of # the specified branch. # -# usage: make -s changelog -# usage: make -s changelog BASE_BRANCH=branch/v13 BASE_TAG=13.2.0 -# usage: BASE_BRANCH=branch/v13 BASE_TAG=13.2.0 make -s changelog +# usage: make changelog +# usage: make changelog BASE_BRANCH=branch/v13 BASE_TAG=v13.2.0 +# usage: BASE_BRANCH=branch/v13 BASE_TAG=v13.2.0 make changelog # # BASE_BRANCH and BASE_TAG will be automatically determined if not specified. +CHANGELOG = github.com/gravitational/shared-workflows/tools/changelog@latest .PHONY: changelog -changelog: $(CHANGELOG) - $(CHANGELOG) --base-branch="$(BASE_BRANCH)" --base-tag="$(BASE_TAG)" ./ +changelog: + @go run $(CHANGELOG) --base-branch="$(BASE_BRANCH)" --base-tag="$(BASE_TAG)" ./ # create-github-release will generate release notes from the CHANGELOG.md and will # create release notes from them.