RepoMirrors
/
nvchecker
mirror of https://github.com/lilydjwg/nvchecker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

github: make use_release_name=false work with include_prereleases 

also make gitref uses the full ref path format. (If someone handles this
value to git, it should still works.)
This commit is contained in:
lilydjwg 2024-11-03 19:08:40 +08:00
parent e1a6517169
commit 28f1ab5144
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nvchecker_source/github.py
View File

@ -120,8 +120,8 @@ async def get_latest_tag(key: Tuple[str, str, str, str]) -> RichResult:
url = f'https://github.com/{repo}/releases/tag/{version}', url = f'https://github.com/{repo}/releases/tag/{version}',
) )
async def get_latest_release_with_prereleases(key: Tuple[str, str, str]) -> RichResult: async def get_latest_release_with_prereleases(key: Tuple[str, str, str, str]) -> RichResult:
host, repo, token = key host, repo, token, use_release_name = key
owner, reponame = repo.split('/') owner, reponame = repo.split('/')
headers = { headers = {
'Authorization': f'bearer {token}', 'Authorization': f'bearer {token}',
@ -143,9 +143,15 @@ async def get_latest_release_with_prereleases(key: Tuple[str, str, str]) -> Rich
if not refs: if not refs:
raise GetVersionError('no release found') raise GetVersionError('no release found')
tag_name = refs[0]['node']['tag']['name']
if use_release_name:
version = refs[0]['node']['name']
else:
version = tag_name
return RichResult( return RichResult(
version = refs[0]['node']['name'], version = version,
gitref = refs[0]['node']['tag']['name'], gitref = f"refs/tags/{tag_name}",
revision = refs[0]['node']['tagCommit']['oid'], revision = refs[0]['node']['tagCommit']['oid'],
url = refs[0]['node']['url'], url = refs[0]['node']['url'],
) )
@ -174,11 +180,14 @@ async def get_version_real(
use_latest_release = conf.get('use_latest_release', False) use_latest_release = conf.get('use_latest_release', False)
include_prereleases = conf.get('include_prereleases', False) include_prereleases = conf.get('include_prereleases', False)
use_release_name = conf.get('use_release_name', False)
if use_latest_release and include_prereleases: if use_latest_release and include_prereleases:
if not token: if not token:
raise GetVersionError('token not given but it is required') raise GetVersionError('token not given but it is required')
return await cache.get((host, repo, token), get_latest_release_with_prereleases) # type: ignore return await cache.get(
(host, repo, token, use_release_name),
get_latest_release_with_prereleases) # type: ignore
br = conf.get('branch') br = conf.get('branch')
path = conf.get('path') path = conf.get('path')
@ -220,7 +229,6 @@ async def get_version_real(
if 'tag_name' not in data: if 'tag_name' not in data:
raise GetVersionError('No release found in upstream repository.') raise GetVersionError('No release found in upstream repository.')
use_release_name = conf.get('use_release_name', False)
if use_release_name: if use_release_name:
version = data['name'] version = data['name']
else: else: