diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3874150c1f29..b7d6a80ce193 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: jobs: # `basics` includes all non-smoke and non-unit CI basics: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 # A few steps are duplicated across all jobs. Can be done better when this feature lands: # https://github.community/t/reusing-sharing-inheriting-steps-between-jobs-declarations/16851 @@ -33,9 +33,9 @@ jobs: # Run pptr tests using ToT Chrome instead of stable default. - name: Define ToT chrome path - run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV + run: echo "CHROME_PATH=/home/ubuntu/chrome-linux-tot/chrome" >> $GITHUB_ENV - name: Install Chrome ToT - working-directory: /home/runner + working-directory: /home/ubuntu run: bash $GITHUB_WORKSPACE/lighthouse-core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot # Run tests that require headfull Chrome. diff --git a/.github/workflows/package-test.yml b/.github/workflows/package-test.yml index 75b9cf01e435..28f1201e52d4 100644 --- a/.github/workflows/package-test.yml +++ b/.github/workflows/package-test.yml @@ -7,7 +7,7 @@ on: jobs: package-test: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 name: Package Test steps: diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 65b3b09fd3f6..fbcffdd5a210 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -16,7 +16,7 @@ jobs: smoke-test-shard: [1, 2, 3] # e.g. if set 1 fails, continue with set 2 anyway fail-fast: false - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 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 @@ -38,12 +38,12 @@ jobs: - name: Define ToT chrome path if: matrix.chrome-channel == 'ToT' - run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV + run: echo "CHROME_PATH=/home/ubuntu/chrome-linux-tot/chrome" >> $GITHUB_ENV # Chrome Stable is already installed by default. - name: Install Chrome ToT if: matrix.chrome-channel == 'ToT' - working-directory: /home/runner + working-directory: /home/ubuntu run: bash $GITHUB_WORKSPACE/lighthouse-core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot - run: yarn install --frozen-lockfile --network-timeout 1000000 @@ -53,7 +53,7 @@ jobs: - run: sudo apt-get install xvfb - name: Run smoke tests run: | - xvfb-run --auto-servernum yarn c8 yarn smoke --debug -j=1 --retries=2 --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL + xvfb-run --auto-servernum yarn c8 yarn smoke --debug --retries=2 --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL yarn c8 report --reporter text-lcov > smoke-coverage.lcov - name: Upload test coverage to Codecov @@ -105,7 +105,7 @@ jobs: path: .tmp/smokehouse-ci-failures/ smoke-fr: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 name: Fraggle Rock steps: @@ -123,7 +123,7 @@ jobs: - run: sudo apt-get install xvfb - name: yarn smoke --fraggle-rock - run: xvfb-run --auto-servernum yarn smoke --debug --fraggle-rock -j=1 --retries=2 + run: xvfb-run --auto-servernum yarn smoke --debug --fraggle-rock --retries=2 # Fail if any changes were written to source files. - run: git diff --exit-code @@ -136,7 +136,7 @@ jobs: path: .tmp/smokehouse-ci-failures/ smoke-bundle: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 name: Bundled Lighthouse steps: @@ -167,7 +167,7 @@ jobs: path: .tmp/smokehouse-ci-failures/ smoke-bundle-fr: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 name: Bundled Fraggle Rock steps: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 6d2f0e059960..29b299ac1624 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: node: ['14', '16', '17'] - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 name: node ${{ matrix.node }} env: LATEST_NODE: '17' @@ -48,9 +48,9 @@ jobs: # Run pptr tests using ToT Chrome instead of stable default. - name: Define ToT chrome path - run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV + run: echo "CHROME_PATH=/home/ubuntu/chrome-linux-tot/chrome" >> $GITHUB_ENV - name: Install Chrome ToT - working-directory: /home/runner + working-directory: /home/ubuntu run: bash $GITHUB_WORKSPACE/lighthouse-core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot - run: yarn test-proto # Run before unit-core because the roundtrip json is needed for proto tests. diff --git a/package.json b/package.json index 8f153642d3b0..65cc6d8714c6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "watch": "yarn unit-core --watch", "unit:cicoverage": "yarn c8 --all yarn unit:ci", "coverage": "yarn unit:cicoverage && c8 report --reporter html", - "coverage:smoke": "yarn c8 yarn smoke -j=1 && c8 report --reporter html", + "coverage:smoke": "yarn c8 yarn smoke && c8 report --reporter html", "devtools": "bash lighthouse-core/scripts/roll-to-devtools.sh", "chrome": "node lighthouse-core/scripts/manual-chrome-launcher.js", "fast": "node ./lighthouse-cli/index.js --preset=desktop --throttlingMethod=provided",