Merge remote-tracking branch 'origin/develop' into feature/3821-block…

…-validation-sidebar
ampproject · Dec 7, 2020 · d5631a1 · d5631a1
2 parents 07bb502 + 778838d
commit d5631a1
Show file tree

Hide file tree

Showing 6 changed files with 608 additions and 366 deletions.
diff --git a/.github/workflows/build-test-measure.yml b/.github/workflows/build-test-measure.yml
@@ -73,7 +73,9 @@ jobs:
         continue-on-error: true
 
       - name: Annotate code linting results
-        uses: ataylorme/[email protected]
+        # The action cannot annotate the PR diff when run from a PR fork
+        if: github.event.pull_request.head.repo.fork == false
+        uses: ataylorme/[email protected]
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           report-json: 'lint-js-report.json'

diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php