Skip to content

Commit

Permalink
Merge branch 'main' into feat/13440--amp-story-audio-sticker
Browse files Browse the repository at this point in the history
  • Loading branch information
Swanand01 committed Apr 5, 2024
2 parents 4dff6c8 + 6b58a6b commit 9ca1981
Show file tree
Hide file tree
Showing 20 changed files with 135 additions and 142 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
54.185.253.63:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -160,7 +160,7 @@ jobs:
composer-options: '--prefer-dist --no-progress --no-interaction'

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Initialize CodeQL
uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -50,7 +50,7 @@ jobs:
run: npm run storybook:build

- name: Checkout gh-pages
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
ref: gh-pages
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-css-js-md.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
54.185.253.63:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -88,7 +88,7 @@ jobs:
PUPPETEER_SKIP_DOWNLOAD: true

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
composer-options: '--prefer-dist --no-progress --no-interaction'

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
dl.cloudsmith.io:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup PHP
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
environment: Production
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -48,7 +48,7 @@ jobs:
PUPPETEER_SKIP_DOWNLOAD: true

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}

Expand All @@ -126,7 +126,7 @@ jobs:
PUPPETEER_SKIP_DOWNLOAD: true

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/plugin-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Verify semver compatibility
run: |
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

# Grab current assets version from `web-stories.php` and pass on to next steps.
# - name: Checkout
# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
# uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
# with:
# ref:

Expand All @@ -143,7 +143,7 @@ jobs:
# ASSETS_VERSION_REGEX: "https://wp.stories.google/static/([^']+)"

- name: Checkout wp.stories.google
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
repository: GoogleForCreators/wp.stories.google
lfs: true
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
fetch-depth: 0 # 0 indicates all history for all branches and tags.
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
composer-options: '--prefer-dist --no-progress --no-interaction'

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Download release artifacts
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427
Expand All @@ -423,7 +423,7 @@ jobs:

- name: Publish Release
id: create_release
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
with:
tag_name: ${{ env.TAG_NAME }}
name: ${{ env.release_name }}
Expand All @@ -449,7 +449,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
ref: main
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
Expand All @@ -466,7 +466,7 @@ jobs:
PUPPETEER_SKIP_DOWNLOAD: true

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: 'Checkout code'
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
persist-credentials: false

Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/tests-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -101,7 +101,7 @@ jobs:
composer-options: '--prefer-dist --no-progress --no-interaction'

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand Down Expand Up @@ -146,16 +146,6 @@ jobs:
wp: 'latest'
snapshots: true
shard: '2/2'
- browser: 'chrome'
wp: '6.5-RC3'
snapshots: false
shard: '1/2'
experimental: true
- browser: 'chrome'
wp: '6.5-RC3'
snapshots: false
shard: '2/2'
experimental: true

steps:
- name: Harden Runner
Expand All @@ -175,7 +165,7 @@ jobs:
34.104.35.123:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Download bundle
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-karma-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
34.104.35.123:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
DISABLE_ERROR_BOUNDARIES: true

- name: Upload code coverage report
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
with:
file: build/logs/karma-coverage/dashboard/lcov.info
flags: karmatests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-karma-editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
34.104.35.123:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
SHARD: ${{ matrix.shard }}

- name: Upload code coverage report
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
with:
file: build/logs/karma-coverage/story-editor/lcov.info
flags: karmatests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-unit-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
fonts.gstatic.com:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -76,7 +76,7 @@ jobs:
cache: npm

- name: Setup Jest cache
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
with:
path: .jest-cache
key: ${{ runner.os }}-${{ env.NVMRC }}-jest
Expand All @@ -103,7 +103,7 @@ jobs:
AMP_VALIDATOR_FILE: ${{ env.validator_file }}

- name: Upload code coverage report
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
with:
file: build/logs/lcov.info
flags: unittests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-unit-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
dl.cloudsmith.io:443
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633

# PHP-Scoper only works on PHP 7.4+ and we need to prefix our dependencies to accurately test them.
# So we temporarily switch PHP versions, do a full install and then remove the package.
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
if: ${{ matrix.random }}

- name: Upload code coverage report
uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
with:
file: build/logs/*.xml
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-browserslist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}

Expand All @@ -41,7 +41,7 @@ jobs:
run: npx browserslist@latest --update-db

- name: Create Pull Request
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
commit-message: Update browserslist db
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-google-fonts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}

Expand All @@ -43,7 +43,7 @@ jobs:
PUPPETEER_SKIP_DOWNLOAD: true

- name: Setup Bun
uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
uses: oven-sh/setup-bun@d3603274aca5625baad52ec06108517a089cdd00
with:
bun-version: latest

Expand All @@ -53,7 +53,7 @@ jobs:
run: npm run workflow:fonts

- name: Create Pull Request
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
commit-message: Update list of Google Fonts
Expand Down
Loading

0 comments on commit 9ca1981

Please sign in to comment.