Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow release version override #432

Open
wants to merge 1 commit into
base: v0.82
Choose a base branch
from
+11 −2
Open

Allow release version override #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,12 @@ git-release-tag-from-dev-tag = $(shell echo $(call git-dev-tag) | grep -P -o "^v
# git-release-tag-for-current-commit gets the release tag for the current commit if there is one.
git-release-tag-for-current-commit = $(shell git describe --tags --exact-match --exclude "*dev*")

# git-release-tag-mismatch-continue prints a warning if the RELEASE_VERSION specified doesn't match
# what we expect
git-release-tag-mismatch-continue = $(warning Given release version $(RELEASE_VERSION) does not match current commit release version $(CURRENT_RELEASE_VERSION), but continuing as requested.")
# git-release-tag-mismatch-fail does as above, but treats it as a fatal error
git-release-tag-mismatch-fail = $(error Given release version $(RELEASE_VERSION) does not match current commit release version $(CURRENT_RELEASE_VERSION).")

# release-branch-for-tag finds the latest branch that corresponds to the given tag.
release-branch-for-tag = $(firstword $(shell git --no-pager branch --format='%(refname:short)' --contains $1 | grep -P "^release"))
# commit-for-tag finds the latest commit that corresponds to the given tag.
Expand Down Expand Up @@ -985,8 +991,11 @@ else
echo Current commit is not tagged with $(RELEASE_TAG) && exit 1)
endif
$(eval CURRENT_RELEASE_VERSION = $(call git-release-tag-from-dev-tag))
$(if $(filter-out $(CURRENT_RELEASE_VERSION),$(RELEASE_VERSION)),\
echo Given release version $(RELEASE_VERSION) does not match current commit release version $(CURRENT_RELEASE_VERSION). && exit 1)
$(if \
$(filter-out $(CURRENT_RELEASE_VERSION),$(RELEASE_VERSION)),\
$(if $(FORCE_RELEASE_VERSION_OVERRIDE),\
$(call git-release-tag-mismatch-continue),\
$(call git-release-tag-mismatch-fail)))

$(eval RELEASE_BRANCH = release-$(if $CNX,calient-,)$(shell echo "$(RELEASE_VERSION)" | awk -F "." '{print $$1"."$$2}'))
$(eval WORKFLOW_FILE = $(if $(CONFIRM),cut-release.yml,test-cut-release.yml))
Expand Down