Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into rtt-estimate-origin-c…
Browse files Browse the repository at this point in the history
…oarse
  • Loading branch information
connorjclark committed Jul 19, 2023
2 parents ba90631 + a4f9313 commit 7a8cfa9
Show file tree
Hide file tree
Showing 326 changed files with 16,039 additions and 17,103 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ third-party/**
# ignore d.ts files until we can properly lint them
**/*.d.ts
**/*.d.cts

page-functions-test-case*out*.js
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [main]
pull_request: # run on all PRs, not just PRs to a particular branch

env:
PUPPETEER_SKIP_DOWNLOAD: 1

jobs:
# `basics` includes all non-smoke and non-unit CI
basics:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/devtools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
env:
DEPOT_TOOLS_PATH: ${{ github.workspace }}/depot-tools
DEVTOOLS_PATH: ${{ github.workspace }}/devtools-frontend
PUPPETEER_SKIP_DOWNLOAD: 1

jobs:
build:
Expand Down Expand Up @@ -175,4 +176,4 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: Smokehouse (devtools smoke)
path: ${{ github.workspace }}/lighthouse/.tmp/smokehouse-ci-failures/
path: ${{ github.workspace }}/lighthouse/.tmp/smokehouse-failures/
27 changes: 3 additions & 24 deletions .github/workflows/package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [main]
pull_request: # run on all PRs, not just PRs to a particular branch

env:
PUPPETEER_SKIP_DOWNLOAD: 1

jobs:
package-test:
runs-on: ubuntu-latest
Expand All @@ -29,27 +32,3 @@ jobs:

# Fail if any changes were written to source files.
- run: git diff --exit-code

package-test-legacy:
runs-on: ubuntu-latest
name: Package Test Legacy Navigation
env:
FORCE_COLOR: true

steps:
- name: git clone
uses: actions/checkout@v2

- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x

- run: yarn install --frozen-lockfile --network-timeout 1000000
- run: yarn build-report
- run: sudo apt-get install xvfb

- run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/core/scripts/release/package-test.sh --legacy-navigation

# Fail if any changes were written to source files.
- run: git diff --exit-code
112 changes: 10 additions & 102 deletions .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [main]
pull_request: # run on all PRs, not just PRs to a particular branch

env:
PUPPETEER_SKIP_DOWNLOAD: 1

jobs:
# `smoke` runs as a matrix across 6 jobs:
# * The smoke tests are split into 3 batches, to parallelize.
Expand Down Expand Up @@ -72,7 +75,7 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: Smokehouse (ubuntu; chrome ${{ matrix.chrome-channel }})
path: .tmp/smokehouse-ci-failures/
path: .tmp/smokehouse-failures/

smoke-windows:
strategy:
Expand All @@ -87,10 +90,11 @@ jobs:
- name: git clone
uses: actions/checkout@v2

- name: Use Node.js 16.x
# Use Node 18 here earlier than everywhere else, see https://github.com/GoogleChrome/lighthouse/issues/15160#issuecomment-1589913408
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.x

- name: Define ToT chrome path
run: echo "CHROME_PATH=${env:GITHUB_WORKSPACE}\chrome-win\chrome.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
Expand All @@ -114,55 +118,7 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: Smokehouse (windows)
path: .tmp/smokehouse-ci-failures/

smoke-legacy:
strategy:
matrix:
smoke-test-shard: [1, 2, 3]
# e.g. if set 1 fails, continue with set 2 anyway
fail-fast: false
runs-on: ubuntu-latest
env:
# The total number of shards. Set dynamically when length of *single* matrix variable is
# computable. See https://github.community/t/get-length-of-strategy-matrix-or-get-all-matrix-options/18342
SHARD_TOTAL: 3
FORCE_COLOR: true
name: Legacy Navigation ${{ matrix.smoke-test-shard }}/3

steps:
- name: git clone
uses: actions/checkout@v2

- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x

- run: yarn install --frozen-lockfile --network-timeout 1000000
- run: yarn build-report
- run: yarn reset-link

- name: Define ToT chrome path
run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV

- name: Install Chrome ToT
working-directory: /home/runner
run: bash $GITHUB_WORKSPACE/core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot

- run: sudo apt-get install xvfb
- name: yarn smoke --legacy-navigation
run: xvfb-run --auto-servernum yarn smoke --debug --legacy-navigation -j=2 --retries=2 --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL

# Fail if any changes were written to source files.
- run: git diff --exit-code

- name: Upload failures
if: failure()
uses: actions/upload-artifact@v1
with:
name: Smokehouse (legacy)
path: .tmp/smokehouse-ci-failures/
path: .tmp/smokehouse-failures/

smoke-bundle:
strategy:
Expand Down Expand Up @@ -200,7 +156,7 @@ jobs:

- run: sudo apt-get install xvfb
- name: yarn test-bundle
run: xvfb-run --auto-servernum yarn test-bundle --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL
run: xvfb-run --auto-servernum yarn test-bundle --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL --retries=2

# Fail if any changes were written to source files.
- run: git diff --exit-code
Expand All @@ -210,52 +166,4 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: Smokehouse (bundled)
path: .tmp/smokehouse-ci-failures/

smoke-bundle-legacy:
strategy:
matrix:
smoke-test-shard: [1, 2, 3]
# e.g. if set 1 fails, continue with set 2 anyway
fail-fast: false
runs-on: ubuntu-latest
env:
# The total number of shards. Set dynamically when length of *single* matrix variable is
# computable. See https://github.community/t/get-length-of-strategy-matrix-or-get-all-matrix-options/18342
SHARD_TOTAL: 3
FORCE_COLOR: true
name: Bundled Legacy Navigation ${{ matrix.smoke-test-shard }}/3

steps:
- name: git clone
uses: actions/checkout@v2

- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x

- run: yarn install --frozen-lockfile --network-timeout 1000000
- run: yarn build-report
- run: yarn build-devtools

- name: Define ToT chrome path
run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV

- name: Install Chrome ToT
working-directory: /home/runner
run: bash $GITHUB_WORKSPACE/core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot

- run: sudo apt-get install xvfb
- name: yarn test-bundle
run: xvfb-run --auto-servernum yarn test-bundle --legacy-navigation --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL

# Fail if any changes were written to source files.
- run: git diff --exit-code

- name: Upload dist
if: failure()
uses: actions/upload-artifact@v1
with:
name: Smokehouse (bundled)
path: .tmp/smokehouse-ci-failures/
path: .tmp/smokehouse-failures/
3 changes: 3 additions & 0 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [main]
pull_request: # run on all PRs, not just PRs to a particular branch

env:
PUPPETEER_SKIP_DOWNLOAD: 1

jobs:
# `unit` includes just unit and proto tests.
unit:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ yarn.lock
**/*.d.cts
!**/types/**/*.d.ts

page-functions-test-case*out*.js
Loading

0 comments on commit 7a8cfa9

Please sign in to comment.