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.

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 2110212130002 #6697

Merged
merged 1 commit into from
Nov 8, 2021

Conversation

westonruter
Copy link
Member

Previously #6651.

  • Run ./bin/amphtml-update.sh (lando ssh -c 'bash ./bin/amphtml-update.sh vendor/amphtml').
  • Examine diff for changelog.
  • Examine upstream diff to ensure nothing was missed.
  • Update spec generator as needed based on spec format changes.
  • Modify validating sanitizer based on changes to spec, if needed.
  • Add tests for key changes, if needed.

Changelog

  • Add allowed values for sticky attribute on amp-ad.

Details

(
    PREV_VERSION=2110152252000;
    THIS_VERSION=2110212130002;
    git checkout $THIS_VERSION;
    git diff $PREV_VERSION...$THIS_VERSION -w -- build-system/compile/bundles.config.extensions.json $( git ls-files | grep '.protoascii' );
    git checkout - > /dev/null
)
Diff 2110152252000...2110212130002
diff --git a/build-system/compile/bundles.config.extensions.json b/build-system/compile/bundles.config.extensions.json
index dbe84fdbf2..c24d40329f 100644
--- a/build-system/compile/bundles.config.extensions.json
+++ b/build-system/compile/bundles.config.extensions.json
@@ -594,6 +594,16 @@
     "version": "0.1",
     "latestVersion": "0.1"
   },
+  {
+    "name": "amp-jwplayer",
+    "version": "1.0",
+    "latestVersion": "0.1",
+    "options": {
+      "hasCss": true,
+      "bento": true,
+      "npm": true
+    }
+  },
   {
     "name": "amp-kaltura-player",
     "version": "0.1",
diff --git a/extensions/amp-ad/validator-amp-ad.protoascii b/extensions/amp-ad/validator-amp-ad.protoascii
index d1e4f9f432..caa53380de 100644
--- a/extensions/amp-ad/validator-amp-ad.protoascii
+++ b/extensions/amp-ad/validator-amp-ad.protoascii
@@ -52,8 +52,11 @@ tags: {  # <amp-ad>
   attrs: {
     name: "sticky"
     value: ""
-    value: "top"
     value: "bottom"
+    value: "bottom-right"
+    value: "left"
+    value: "right"
+    value: "top"
   }
   attrs: { name: "always-serve-npa" }
   attrs: { name: "block-rtc" }

Sorry, something went wrong.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@westonruter westonruter added this to the v2.2 milestone Nov 8, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2021

Plugin builds for ed1b2fb are ready 🛎️!

@westonruter westonruter merged commit 4b15c34 into develop Nov 8, 2021
@westonruter westonruter deleted the update/amphtml-2110212130002 branch November 8, 2021 17:52
westonruter added a commit that referenced this pull request Nov 8, 2021
@westonruter westonruter added the Changelogged Whether the issue/PR has been added to release notes. label Dec 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelogged Whether the issue/PR has been added to release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant