Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update amphtml spec to 2110152252000 #6651

Merged
merged 4 commits into from
Oct 19, 2021
Merged

Update amphtml spec to 2110152252000 #6651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb6d3af
Update amphtml spec to 530a457
westonruter Oct 18, 2021
f842725
Update tests to fix failures
westonruter Oct 18, 2021
09e07e6
Add test for amp-story-captions
westonruter Oct 19, 2021
2274744
Remove unused variable
westonruter Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion bin/amphtml-update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ def ParseRules(repo_directory, out_dir):
if extensions_versions[ extension['name'] ]['latest'] is not None and extensions_versions[ extension['name'] ]['latest'] != extension['latestVersion']:
logging.info('Warning: latestVersion mismatch for ' + extension['name'])
extensions_versions[ extension['name'] ]['latest'] = extension['latestVersion']
if 'options' in extension and 'wrapper' in extension['options'] and extension['options']['wrapper'] == 'bento':
if 'options' in extension and ( ( 'bento' in extension['options'] and extension['options']['bento'] ) or ( 'wrapper' in extension['options'] and extension['options']['wrapper'] == 'bento' ) ):
extensions_versions[ extension['name'] ]['bento'] = {
'version': extension['version'],
'has_css': extension['options'].get( 'hasCss', False ),
Expand All @@ -492,6 +492,16 @@ def ParseRules(repo_directory, out_dir):
logging.info( 'Skipping bento for ' + extension_name + ' since version ' + extensions_versions[extension_name]['bento']['version'] + ' is not yet valid' )
del extensions_versions[extension_name]['bento']

# Verify bento_supported_version matches the version info in the bundle file.
if 'bento_supported_version' in extension_script_list[0]['tag_spec']['extension_spec']:
if 'bento' not in extensions_versions[extension_name]:
logging.info( 'Warning: bento_supported_version found but bento not meta not obtained for ' + extension_name )
elif extension_script_list[0]['tag_spec']['extension_spec']['bento_supported_version'][0] != extensions_versions[extension_name]['bento']['version']:
logging.info( 'Warning: bento_supported_version does not match the bento meta version for ' + extension_name )

# Remove redundant information.
del extension_script_list[0]['tag_spec']['extension_spec']['bento_supported_version']

validator_versions = sorted( validator_versions, key=lambda version: map(int, version.split('.') ) )
extension_script_list[0]['tag_spec']['extension_spec']['version'] = validator_versions

Expand Down
Loading