meson: consider only 'v0.*' tags when computing the version
This allow creating other tags on the repository and don't interfere with version string generated.
This commit is contained in:
1 parent
1ad1322335
commit
f88f423829
2 files changed
+2
-2
No files matched your search
@@ -738,7 +738,7 @@ jobs:
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Match the version string baked into the build (see common/meson.build).
|
# Match the version string baked into the build (see common/meson.build).
|
||||||
version=$(git describe --abbrev=9 --tags --dirty)
|
version=$(git describe --abbrev=9 --tags --dirty --match "v0.*")
|
||||||
notes=$(cat <<EOF
|
notes=$(cat <<EOF
|
||||||
Automated development build of the latest \`master\` branch.
|
Automated development build of the latest \`master\` branch.
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ if not sys.argv[1]:
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
git_cmd = [sys.argv[1], "--git-dir=" + os.path.join(sys.argv[2], ".git"),
|
git_cmd = [sys.argv[1], "--git-dir=" + os.path.join(sys.argv[2], ".git"),
|
||||||
"--work-tree=" + sys.argv[2]]
|
"--work-tree=" + sys.argv[2]]
|
||||||
describe_cmd = git_cmd + ["describe", "--abbrev=9", "--tags", "--dirty"]
|
describe_cmd = git_cmd + ["describe", "--abbrev=9", "--tags", "--dirty", "--match", "v0.*"]
|
||||||
try:
|
try:
|
||||||
ver = check_output(describe_cmd, stderr=DEVNULL, encoding="UTF-8")
|
ver = check_output(describe_cmd, stderr=DEVNULL, encoding="UTF-8")
|
||||||
except CalledProcessError:
|
except CalledProcessError:
|
||||||
|
|||||||
Reference in new issue
Block a user