Skip to content

Commit aeaa0ad

Browse files
authored
[v16] build: Fix "make create-github-release" (#49167)
* build: Fix "make create-github-release" Fix the `create-github-release` make target to use "go run" to run the tool that creates the github release. This used to run a tool in this repository that was pre-built, so the "go run" was not needed before. Now the tool has moved to a separate repository, this is required. * build: Remove single-use vars for simplicity Remove the `CHANGELOG` and `RELEASE_NOTES_GEN` vars that contained the name of a Go main package to run in favor of a straightforward "go run" command.
1 parent f062e30 commit aeaa0ad

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,10 @@ rustup-install-target-toolchain: rustup-set-version
17251725
# usage: BASE_BRANCH=branch/v13 BASE_TAG=v13.2.0 make changelog
17261726
#
17271727
# BASE_BRANCH and BASE_TAG will be automatically determined if not specified.
1728-
CHANGELOG = github.com/gravitational/shared-workflows/tools/changelog@latest
17291728
.PHONY: changelog
17301729
changelog:
1731-
@go run $(CHANGELOG) --base-branch="$(BASE_BRANCH)" --base-tag="$(BASE_TAG)" ./
1730+
@go run github.com/gravitational/shared-workflows/tools/changelog@latest \
1731+
--base-branch="$(BASE_BRANCH)" --base-tag="$(BASE_TAG)" ./
17321732

17331733
# create-github-release will generate release notes from the CHANGELOG.md and will
17341734
# create release notes from them.
@@ -1742,12 +1742,14 @@ changelog:
17421742
#
17431743
# For more information on release notes generation see:
17441744
# https://github.com/gravitational/shared-workflows/tree/gus/release-notes/tools/release-notes#readme
1745-
RELEASE_NOTES_GEN = github.com/gravitational/shared-workflows/tools/release-notes@latest
17461745
.PHONY: create-github-release
17471746
create-github-release: LATEST = false
17481747
create-github-release: GITHUB_RELEASE_LABELS = ""
17491748
create-github-release:
1750-
@NOTES=$$($(RELEASE_NOTES_GEN) --labels=$(GITHUB_RELEASE_LABELS) $(VERSION) CHANGELOG.md) && gh release create v$(VERSION) \
1749+
@NOTES=$$( \
1750+
go run github.com/gravitational/shared-workflows/tools/release-notes@latest \
1751+
--labels=$(GITHUB_RELEASE_LABELS) $(VERSION) CHANGELOG.md \
1752+
) && gh release create v$(VERSION) \
17511753
-t "Teleport $(VERSION)" \
17521754
--latest=$(LATEST) \
17531755
--verify-tag \

0 commit comments

Comments
 (0)