fix: 修复linux CI 及部分版本号获取方法

This commit is contained in:
MistEO
2023-05-03 19:57:50 +08:00
parent d6613be525
commit 2fca17d64f
3 changed files with 6 additions and 6 deletions

View File

@@ -50,7 +50,7 @@ jobs:
- id: set_tag
run: |
${{ startsWith(github.ref, 'refs/pull/') && 'cd temp' || '' }}
echo tag=$(git describe --tags ${{ github.ref }} || git rev-parse --short HEAD) | tee -a $GITHUB_OUTPUT
echo tag=$(git describe --tags --match "v*" ${{ github.ref }} || git rev-parse --short HEAD) | tee -a $GITHUB_OUTPUT
exit ${PIPESTATUS[0]}
- id: set_pre
@@ -65,9 +65,9 @@ jobs:
run: |
this_tag=${{ steps.set_tag.outputs.tag }}
if [[ '${{ steps.set_pre.outputs.prerelease }}' != 'false' ]]; then
last_tag=$(git describe --tags --abbrev=0 --exclude='${{ steps.set_tag.outputs.tag }}')
last_tag=$(git describe --tags --match "v*" --abbrev=0 --exclude='${{ steps.set_tag.outputs.tag }}')
else
last_tag=$(git describe --tags --abbrev=0 --exclude='${{ steps.set_tag.outputs.tag }}' --exclude='*-*')
last_tag=$(git describe --tags --match "v*" --abbrev=0 --exclude='${{ steps.set_tag.outputs.tag }}' --exclude='*-*')
fi
echo >> CHANGELOG.md
echo "**Full Changelog**: [$last_tag -> $this_tag](https://github.com/MaaAssistantArknights/MaaAssistantArknights/compare/${last_tag}...${this_tag})" >> CHANGELOG.md

View File

@@ -211,10 +211,10 @@ def main(tag_name=None, latest=None):
pass
# 从哪个 tag 开始
if latest == None:
latest = os.popen("git describe --abbrev=0 --tags").read().strip()
latest = os.popen("git describe --tags --match 'v*' --abbrev=0").read().strip()
if tag_name == None:
tag_name = os.popen("git describe --tags").read().strip()
tag_name = os.popen("git describe --tags --match 'v*'").read().strip()
print("From:", latest, ", To:", tag_name, "\n")
# 输出一张好看的 git log 图到控制台

View File

@@ -4,7 +4,7 @@ LatestTagId=$(git rev-list --tags --max-count=1 --abbrev-commit)
LatestCommitId=$(git rev-list --all --max-count=1 --abbrev-commit)
if [ $LatestTagId = $LatestCommitId ]; then
Version=$(git describe --tags $LatestTagId)
Version=$(git describe --tags --match "v*" $LatestTagId)
else
Version="c""$LatestCommitId"
fi