Skip to content

Issue ee 2354 #3032

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Issue ee 2354 #3032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c03fd
set the version as the latest tag
ColdWaterLW May 6, 2025
0b684f0
reuse code
ColdWaterLW May 6, 2025
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################## Parameter Definition And Check ##########################################
# 当前 HEAD 的 tag
HEAD_TAG = $(shell git describe --exact-match --tags 2>/dev/null)
HEAD_TAG = $(shell git tag --points-at HEAD | tail -n1 2>/dev/null)

# 当前分支名
HEAD_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
Expand Down Expand Up @@ -43,7 +43,7 @@ ifeq ($(IS_PRODUCTION_RELEASE),true)
# 2. if there is no tag on current commit, means that
# current branch is on process.
# Set rpm name with current branch name(release-1.2109.x-ee or release-1.2109.x -> 1.2109.x).
PROJECT_VERSION = $(shell if [ "$$(git tag --points-at HEAD | tail -n1)" ]; then git tag --points-at HEAD | tail -n1 | sed 's/v\(.*\)/\1/'; else git rev-parse --abbrev-ref HEAD | sed 's/release-\(.*\)/\1/' | tr '-' '\n' | head -n1; fi)
PROJECT_VERSION = $(shell if [ -n "$(HEAD_TAG)" ]; then echo $(HEAD_TAG) | sed 's/v\(.*\)/\1/'; else git rev-parse --abbrev-ref HEAD | sed 's/release-\(.*\)/\1/' | tr '-' '\n' | head -n1; fi)
else
# When performing daily packaging, set rpm name with current branch name(release-1.2109.x-ee or release-1.2109.x -> 1.2109.x).
PROJECT_VERSION = $(shell git rev-parse --abbrev-ref HEAD | sed 's/release-\(.*\)/\1/' | tr '-' '\n' | head -n1)
Expand Down
Loading