-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:ampproject/amphtml into add/importa…
…nce-attr-to-hero-img * 'main' of github.com:ampproject/amphtml: (525 commits) mathml storybook: supply missing component definition. (#37326) storybook: Iframe --> BentoIframe (#37327) 🖍 [Story system layer] New ad badge (#37311) 🐛 [amp story] Replay/next page button bug fix (#37316) 🚀 [Story performance] Remove affiliate links (#37280) Compiler: Add amp-carousel-0.1 to the builder map (#37308) ⏪ [Story system layer] Audio icon disappears when story has background audio (#37314) 🚀 [Story performance] Remove story access (#37281) Fix remapping esbuild output on Windows (#37312) 🐛 adds in correct weight for amp-story-product-tag text (#37188) typechecking carousel: remove shame files (#37213) Use remapping to remap minified sourcemap into source code (#37238) SwG Release 0.1.22.199 (#37310) 🐛 Adds microsoft-edge protocol (#34168) Sync for validator cpp engine and cpp htmlparser (#37292) ✨ amp-story-shopping Updated currency with product price and correct Localized currency (#37249) ✨[Smartadserver ad extension] Implement support for Fast Fetch (#36991) Remove client-side-experiments-config.json from this repo (#37304) 🚮 Remove closure compiler logic from build-system. (#37296) 🌐 Added RTL ordering i18n for amp story shopping tag (#37252) ...
- Loading branch information
Showing
1,952 changed files
with
93,855 additions
and
43,762 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#!/bin/bash | ||
# | ||
# Script used to determine the pinned version of Google Chrome on CircleCI. | ||
|
||
set -e | ||
|
||
GREEN() { echo -e "\033[0;32m$1\033[0m"; } | ||
RED() { echo -e "\033[0;31m$1\033[0m"; } | ||
CYAN() { echo -e "\033[0;36m$1\033[0m"; } | ||
|
||
# Extract the chromedriver version used by AMP's E2E tests | ||
# See https://www.npmjs.com/package/chromedriver | ||
echo "$(GREEN "Extracting Chromedriver version from") $(CYAN "build-system/tasks/e2e/package.json")$(GREEN "...")" | ||
CHROMEDRIVER_VERSION="$(cat build-system/tasks/e2e/package.json | jq -r .devDependencies.chromedriver)" | ||
if [[ -z "$CHROMEDRIVER_VERSION" ]]; then | ||
echo "$(RED "Could not extract Chromedriver version from") $(CYAN "build-system/tasks/e2e/package.json"))" | ||
exit 1 | ||
fi | ||
echo "$(GREEN "Chromedriver version is") $(CYAN "${CHROMEDRIVER_VERSION}")" | ||
|
||
# Determine the Chrome major version to be installed | ||
echo "$(GREEN "Determining Chrome major version...")" | ||
CHROME_MAJOR_VERSION="$(echo $CHROMEDRIVER_VERSION | cut -d'.' -f1)" | ||
if [[ -z "$CHROME_MAJOR_VERSION" ]]; then | ||
echo "$(RED "Could not determine Chrome major version")" | ||
exit 1 | ||
fi | ||
echo "$(GREEN "Chrome major version is") $(CYAN "${CHROME_MAJOR_VERSION}")" | ||
|
||
# Determine the Chrome version history URL based on the platform identifier | ||
# See https://developer.chrome.com/docs/versionhistory/reference/#platform-identifiers | ||
echo "$(GREEN "Determining Chrome version history URL...")" | ||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then | ||
PLATFORM_IDENTIFIER="linux" | ||
elif [[ "$OSTYPE" == "darwin"* ]]; then | ||
PLATFORM_IDENTIFIER="mac" | ||
elif [[ "$OSTYPE" == "win32" ]]; then | ||
PLATFORM_IDENTIFIER="win" | ||
else | ||
echo "$(RED "Incompatible OS") $(CYAN "${OSTYPE}")" | ||
exit 1 | ||
fi | ||
CHROME_VERSION_HISTORY_URL="https://versionhistory.googleapis.com/v1/chrome/platforms/${PLATFORM_IDENTIFIER}/channels/stable/versions" | ||
echo "$(GREEN "Chrome version history URL is") $(CYAN "${CHROME_VERSION_HISTORY_URL}")" | ||
|
||
# Determine the Chrome version | ||
# See https://developer.chrome.com/docs/versionhistory/guide | ||
echo "$(GREEN "Determining Chrome version...")" | ||
CHROME_VERSION="$(curl -sS ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.")" | ||
if [[ -z "$CHROME_VERSION" ]]; then | ||
echo "$(RED "Could not determine Chrome version")" | ||
exit 1 | ||
fi | ||
echo "$(GREEN "Chrome version is") $(CYAN "${CHROME_VERSION}")" | ||
|
||
echo "export CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV | ||
echo $(GREEN "Successfully determined pinned version of Chrome") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,32 @@ | ||
# Local cache directories | ||
# Keep this list in sync with .gitignore, .prettierignore, and build-system/tasks/clean.js | ||
.babel-cache | ||
.css-cache | ||
.jss-cache | ||
.pre-closure-cache | ||
# Files and directories explicitly ignored by eslint | ||
**/node_modules/** | ||
build-system/babel-plugins/**/fixtures/**/*.js | ||
build-system/babel-plugins/**/fixtures/**/*.mjs | ||
build-system/tasks/make-extension/template/**/* | ||
examples/amp-script/todomvc.ssr.js | ||
examples/amp-script/vue-todomvc.js | ||
extensions/amp-a4a/0.1/test/testdata/** | ||
src/purifier/noop.js | ||
testing/local-amp-chrome-extension/** | ||
third_party/** | ||
validator/** | ||
|
||
# [GLOBALLY IGNORED] | ||
# (Don't edit or remove the above comment!) | ||
# The rules below are synced between .gitignore and .prettierignore, and are | ||
# removed by `amp clean`. | ||
|
||
# Output directories | ||
# Keep this list in sync with .gitignore, .prettierignore, and build-system/tasks/clean.js | ||
.*cache | ||
.amp-dep-check | ||
build | ||
build-system/dist | ||
build-system/server/new-server/transforms/dist | ||
build-system/tasks/performance/cache | ||
build-system/tasks/performance/results.json | ||
build-system/global-configs/custom-config.json | ||
dist | ||
dist.3p | ||
dist.tools | ||
export | ||
examples/storybook | ||
extensions/**/dist | ||
/release | ||
result-reports | ||
src/purifier/dist | ||
test/coverage | ||
test/coverage-e2e | ||
validator/**/dist | ||
validator/export | ||
|
||
# Files and directories explicitly ignored by eslint | ||
**/node_modules/** | ||
build-system/babel-plugins/**/fixtures/**/*.js | ||
build-system/babel-plugins/**/fixtures/**/*.mjs | ||
build-system/tasks/make-extension/template/**/* | ||
examples/amp-script/todomvc.ssr.js | ||
examples/amp-script/vue-todomvc.js | ||
extensions/amp-a4a/0.1/test/testdata/** | ||
src/purifier/noop.js | ||
testing/local-amp-chrome-extension/** | ||
third_party/** | ||
validator/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.