diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 68c2a73..bae3d52 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -63,11 +63,34 @@ jobs: test-results/ retention-days: 7 + playwright-version: + runs-on: ubuntu-latest + outputs: + version: ${{ steps.read-version.outputs.version }} + steps: + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Read locked Playwright version + id: read-version + shell: bash + run: | + version="$(node -p "require('./package-lock.json').packages['node_modules/@playwright/test'].version")" + if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Unsupported Playwright version: $version" >&2 + exit 1 + fi + echo "version=$version" >> "$GITHUB_OUTPUT" + screenshot-container: + needs: playwright-version runs-on: ubuntu-latest name: Screenshot check in container + timeout-minutes: 15 container: - image: mcr.microsoft.com/playwright:v1.63.0-noble + image: mcr.microsoft.com/playwright:v${{ needs.playwright-version.outputs.version }}-noble steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/package-lock.json b/package-lock.json index e05d4f6..0fe657f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -681,13 +681,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.63.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.63.0.tgz", - "integrity": "sha512-oxMK4vllB9RK5NQ2l1pq1IfOf2AvnEuj/vYGDj0H2nMtmtZpKtCwt/l00GEO6xjGfpBNAvjovvYdCm50dRQkpQ==", + "version": "1.65.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.65.0.tgz", + "integrity": "sha512-iGURLGuKDLakSEl7Pgfv8h7f+XLT+V861Wfhz0zlEl5nyFuKUopdkFBPKqTllTUp06aOwPuH8iuUEb3yp3MpbQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.63.0" + "playwright": "1.65.0" }, "bin": { "playwright": "cli.js" @@ -3551,13 +3551,13 @@ } }, "node_modules/playwright": { - "version": "1.63.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.63.0.tgz", - "integrity": "sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==", + "version": "1.65.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.65.0.tgz", + "integrity": "sha512-F3AMWcR44qMBt4kq+6Kb6mX7bjGXshktKFOPULd7reED6ZJWevjbNRqysP7q+AATE9kdPEZBibex1BYsvpVoeA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.63.0" + "playwright-core": "1.65.0" }, "bin": { "playwright": "cli.js" @@ -3567,9 +3567,9 @@ } }, "node_modules/playwright-core": { - "version": "1.63.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.63.0.tgz", - "integrity": "sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==", + "version": "1.65.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.65.0.tgz", + "integrity": "sha512-vNSKgH6YqtN7cdT/L334zo0a+YwkrpicyrHJlWWPIm/Q+Nn2SWInil01oT0mbu96U4GgoRtCYQD9CzJQgju+lA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/scripts/generate-screenshots.mjs b/scripts/generate-screenshots.mjs index 4deb227..6152839 100644 --- a/scripts/generate-screenshots.mjs +++ b/scripts/generate-screenshots.mjs @@ -16,8 +16,9 @@ export async function generateScreenshot() { const server = await createServer() await server.listen() - const browser = await chromium.launch() + let browser try { + browser = await chromium.launch() const context = await browser.newContext({ ...devices['Desktop Chrome'], locale: 'en-US', @@ -43,8 +44,11 @@ export async function generateScreenshot() { return await page.screenshot({ animations: 'disabled' }) } finally { - await browser.close() - await server.close() + try { + await browser?.close() + } finally { + await server.close() + } } }