diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5b5628a830..bd930d2e906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,8 +150,8 @@ jobs: - chrome-new-headless - chrome-bidi shard: - - 1/2 - - 2/2 + - 1-2 + - 2-2 exclude: - os: windows-latest suite: chrome-bidi @@ -204,10 +204,10 @@ jobs: run: xvfb-run --auto-servernum npm run test -- --shard '${{ matrix.shard }}' --test-suite ${{ matrix.suite }} --save-stats-to /tmp/artifacts/${{ github.event_name }}_INSERTID.json env: PUPPETEER_EXECUTABLE_PATH: ${{ steps.browser.outputs.executablePath }} - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: test-results + name: test-results-${{ matrix.os }}-${{ matrix.suite }}-${{ matrix.shard }} path: /tmp/artifacts/*.json chrome-tests-required: @@ -236,10 +236,10 @@ jobs: - firefox-headful - firefox-headless shard: - - 1/4 - - 2/4 - - 3/4 - - 4/4 + - 1-4 + - 2-4 + - 3-4 + - 4-4 exclude: - os: macos-latest suite: firefox-headful @@ -282,10 +282,10 @@ jobs: - name: Run all tests (for Linux) if: ${{ matrix.os == 'ubuntu-latest' }} run: xvfb-run --auto-servernum npm run test -- --shard '${{ matrix.shard }}' --test-suite ${{ matrix.suite }} --save-stats-to /tmp/artifacts/${{ github.event_name }}_INSERTID.json - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: always() with: - name: test-results + name: test-results-${{ matrix.os }}-${{ matrix.suite }}-${{ matrix.shard }} path: /tmp/artifacts/*.json firefox-tests-required: @@ -320,7 +320,7 @@ jobs: - name: Pack installation test run: npm pack --workspace @puppeteer-test/installation - name: Upload installation test - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: name: installation-test path: puppeteer-test-installation-latest.tgz @@ -343,7 +343,7 @@ jobs: - npm steps: - name: Download installation test - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0 with: name: installation-test - name: Unpack installation test diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml index 5dd411111fc..e17f4a130a1 100644 --- a/.github/workflows/devtools.yml +++ b/.github/workflows/devtools.yml @@ -39,7 +39,7 @@ jobs: npm pack -w puppeteer-core npm pack -w puppeteer - name: Upload Puppeteer build - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: name: puppeteer-build if-no-files-found: error @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Puppeteer build - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0 with: name: puppeteer-build - name: Set up Node.js diff --git a/.github/workflows/issue-analyzer.yml b/.github/workflows/issue-analyzer.yml index a25e375828d..d2ed35a9bc9 100644 --- a/.github/workflows/issue-analyzer.yml +++ b/.github/workflows/issue-analyzer.yml @@ -64,7 +64,7 @@ jobs: - name: Analyze issue id: issue-analysis run: echo $ISSUE_BODY | ./tools/analyze_issue.mjs >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: name: issue-files path: out/ @@ -79,7 +79,7 @@ jobs: PACKAGE_MANAGER: ${{ needs.analyze-issue.outputs.packageManager }} NODE_VERSION: ${{ needs.analyze-issue.outputs.nodeVersion }} steps: - - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 + - uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0 with: name: issue-files path: '.' @@ -102,7 +102,7 @@ jobs: run: ${{ env.PACKAGE_MANAGER }} run verify env: DEBUG: 'puppeteer:*' - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 if: success() || failure() with: name: runtime-output diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 5e6d8fae04a..bf07672bd7c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -41,7 +41,7 @@ jobs: # Upload the results as artifacts (optional). - name: 'Upload artifact' - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 with: name: SARIF file path: results.sarif diff --git a/tools/mocha-runner/src/mocha-runner.ts b/tools/mocha-runner/src/mocha-runner.ts index f84df1ababa..bba489b537a 100644 --- a/tools/mocha-runner/src/mocha-runner.ts +++ b/tools/mocha-runner/src/mocha-runner.ts @@ -215,7 +215,7 @@ async function main() { }); if (shard) { // Shard ID is 1-based. - const [shardId, shards] = shard.split('/').map(s => { + const [shardId, shards] = shard.split('-').map(s => { return Number(s); }) as [number, number]; const argsLength = args.length; @@ -228,7 +228,7 @@ async function main() { throw new Error('Shard did not result in any test files'); } console.log( - `Running shard ${shardId}/${shards}. Picked ${ + `Running shard ${shardId}-${shards}. Picked ${ args.length - argsLength } files out of ${specs.length}.` );