[build] Save Git HEAD at release alongside version info

This commit is contained in:
pukkandan 2021-11-29 22:30:02 +05:30
parent f2ebc5c7be
commit 36eaf3039a
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
4 changed files with 45 additions and 34 deletions

View File

@ -31,8 +31,6 @@ jobs:
run: | run: |
python devscripts/update-version.py python devscripts/update-version.py
make issuetemplates make issuetemplates
- name: Print version
run: echo "${{ steps.bump_version.outputs.ytdlp_version }}"
- name: Update master - name: Update master
id: push_update id: push_update
run: | run: |

View File

@ -1,16 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from __future__ import unicode_literals
from datetime import datetime from datetime import datetime
# import urllib.request import subprocess
# response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION')
# old_version = response.read().decode('utf-8')
exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec')) with open('yt_dlp/version.py', 'rt') as f:
exec(compile(f.read(), 'yt_dlp/version.py', 'exec'))
old_version = locals()['__version__'] old_version = locals()['__version__']
old_version_list = old_version.split(".", 4) old_version_list = old_version.split('.')
old_ver = '.'.join(old_version_list[:3]) old_ver = '.'.join(old_version_list[:3])
old_rev = old_version_list[3] if len(old_version_list) > 3 else '' old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
@ -19,15 +16,23 @@ ver = datetime.utcnow().strftime("%Y.%m.%d")
rev = str(int(old_rev or 0) + 1) if old_ver == ver else '' rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
VERSION = '.'.join((ver, rev)) if rev else ver VERSION = '.'.join((ver, rev)) if rev else ver
# VERSION_LIST = [(int(v) for v in ver.split(".") + [rev or 0])]
try:
sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
GIT_HEAD = sp.communicate()[0].decode().strip() or None
except Exception:
GIT_HEAD = None
VERSION_FILE = f'''
# Autogenerated by devscripts/update-version.py
__version__ = {VERSION!r}
RELEASE_GIT_HEAD = {GIT_HEAD!r}
'''.lstrip()
with open('yt_dlp/version.py', 'wt') as f:
f.write(VERSION_FILE)
print('::set-output name=ytdlp_version::' + VERSION) print('::set-output name=ytdlp_version::' + VERSION)
print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')
file_version_py = open('yt_dlp/version.py', 'rt')
data = file_version_py.read()
data = data.replace(old_version, VERSION)
file_version_py.close()
file_version_py = open('yt_dlp/version.py', 'wt')
file_version_py.write(data)
file_version_py.close()

View File

@ -153,7 +153,7 @@ from .postprocessor import (
_PLUGIN_CLASSES as plugin_postprocessors _PLUGIN_CLASSES as plugin_postprocessors
) )
from .update import detect_variant from .update import detect_variant
from .version import __version__ from .version import __version__, RELEASE_GIT_HEAD
if compat_os_name == 'nt': if compat_os_name == 'nt':
import ctypes import ctypes
@ -3401,7 +3401,11 @@ class YoutubeDL(object):
write_debug = lambda msg: self._write_string(f'[debug] {msg}\n') write_debug = lambda msg: self._write_string(f'[debug] {msg}\n')
source = detect_variant() source = detect_variant()
write_debug('yt-dlp version %s%s' % (__version__, '' if source == 'unknown' else f' ({source})')) write_debug(join_nonempty(
'yt-dlp version', __version__,
f'[{RELEASE_GIT_HEAD}]' if RELEASE_GIT_HEAD else '',
'' if source == 'unknown' else f'({source})',
delim=' '))
if not _LAZY_LOADER: if not _LAZY_LOADER:
if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'): if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
write_debug('Lazy loading extractors is forcibly disabled') write_debug('Lazy loading extractors is forcibly disabled')
@ -3413,20 +3417,22 @@ class YoutubeDL(object):
for name, klass in itertools.chain(plugin_extractors.items(), plugin_postprocessors.items())]) for name, klass in itertools.chain(plugin_extractors.items(), plugin_postprocessors.items())])
if self.params.get('compat_opts'): if self.params.get('compat_opts'):
write_debug('Compatibility options: %s' % ', '.join(self.params.get('compat_opts'))) write_debug('Compatibility options: %s' % ', '.join(self.params.get('compat_opts')))
try:
sp = Popen( if source == 'source':
['git', 'rev-parse', '--short', 'HEAD'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=os.path.dirname(os.path.abspath(__file__)))
out, err = sp.communicate_or_kill()
out = out.decode().strip()
if re.match('[0-9a-f]+', out):
write_debug('Git HEAD: %s' % out)
except Exception:
try: try:
sys.exc_clear() sp = Popen(
['git', 'rev-parse', '--short', 'HEAD'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=os.path.dirname(os.path.abspath(__file__)))
out, err = sp.communicate_or_kill()
out = out.decode().strip()
if re.match('[0-9a-f]+', out):
write_debug('Git HEAD: %s' % out)
except Exception: except Exception:
pass try:
sys.exc_clear()
except Exception:
pass
def python_implementation(): def python_implementation():
impl_name = platform.python_implementation() impl_name = platform.python_implementation()

View File

@ -1,3 +1,5 @@
from __future__ import unicode_literals # Autogenerated by devscripts/update-version.py
__version__ = '2021.11.10.1' __version__ = '2021.11.10.1'
RELEASE_GIT_HEAD = '7144b697f'