github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't include skip ci commits for Docker/Snap update check

Browse source
This commit is contained in:
JonnyWong16 2021-03-05 19:19:12 -08:00
parent 834ce9448d
commit 41ee863d2a
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plexpy/versioncheck.py
View file

@ -223,10 +223,11 @@ def check_github(scheduler=False, notify=False, use_cache=False):
commits = github_cache('commits', use_cache=use_cache) commits = github_cache('commits', use_cache=use_cache)
if not commits: if not commits:
logger.info('Comparing currently installed version with latest GitHub version') logger.info('Comparing currently installed version with latest GitHub version')
# Need to compare CURRENT << LATEST to get a list of commits
url = 'https://api.github.com/repos/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, url = 'https://api.github.com/repos/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER,
plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_REPO,
plexpy.LATEST_VERSION, plexpy.CURRENT_VERSION,
plexpy.CURRENT_VERSION) plexpy.LATEST_VERSION)
commits = request.request_json(url, headers=headers, timeout=20, whitelist_status_code=404, commits = request.request_json(url, headers=headers, timeout=20, whitelist_status_code=404,
validator=lambda x: type(x) == dict) validator=lambda x: type(x) == dict)
github_cache('commits', github_data=commits) github_cache('commits', github_data=commits)
@ -236,8 +237,20 @@ def check_github(scheduler=False, notify=False, use_cache=False):
return plexpy.LATEST_VERSION return plexpy.LATEST_VERSION
try: try:
plexpy.COMMITS_BEHIND = int(commits['behind_by']) ahead_by = int(commits['ahead_by'])
logger.debug("In total, %d commits behind", plexpy.COMMITS_BEHIND) logger.debug("In total, %d commits behind", ahead_by)
# Do not count [skip ci] commits for Docker or Snap on the nightly branch
if (plexpy.DOCKER or plexpy.SNAP) and plexpy.CONFIG.GIT_BRANCH == 'nightly':
for commit in reversed(commits['commits']):
if '[skip ci]' not in commit['commit']['message']:
plexpy.LATEST_VERSION = commit['sha']
break
ahead_by -= 1
install = 'Docker container' if plexpy.DOCKER else 'Snap package'
logger.debug("%s %d commits behind", install, ahead_by)
plexpy.COMMITS_BEHIND = ahead_by
except KeyError: except KeyError:
logger.info('Cannot compare versions. Are you running a local development version?') logger.info('Cannot compare versions. Are you running a local development version?')
plexpy.COMMITS_BEHIND = 0 plexpy.COMMITS_BEHIND = 0