From fecb42375e1a385763567fe88fe8662ed1b6b912 Mon Sep 17 00:00:00 2001 From: Nir Tal Date: Mon, 7 Apr 2025 17:13:56 +0300 Subject: [PATCH 1/3] docker --- .github/workflows/devRun.yml | 6 ++---- .github/workflows/nightly.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/devRun.yml b/.github/workflows/devRun.yml index 8e7c3031e..cdb359cd9 100644 --- a/.github/workflows/devRun.yml +++ b/.github/workflows/devRun.yml @@ -8,6 +8,8 @@ jobs: merge_test: timeout-minutes: 15 runs-on: ubuntu-latest + container: + image: mcr.microsoft.com/playwright:v1.51-jammy steps: - uses: actions/checkout@v4 - name: Set up Python @@ -22,10 +24,6 @@ jobs: run: | uv venv uv sync --all-extras --dev - - name: Install Playwright Browsers - run: | - PLAYWRIGHT_VERSION=$(grep -E '^playwright = "[^"]*"' pyproject.toml | sed -E 's/playwright = "([^"]*)".*$/\1/') - npx playwright@$PLAYWRIGHT_VERSION install --with-deps - name: Test with pytest run: xvfb-run .venv/bin/python -m pytest -m devRun --base-url ${{ vars.BASE_URL }} - name: Auto-assign reviewers diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 89fe0a96e..9928b55a6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -31,6 +31,8 @@ jobs: nightly-test: needs: setup-matrix runs-on: ubuntu-latest + container: + image: mcr.microsoft.com/playwright:v1.51-jammy strategy: fail-fast: false matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} @@ -48,10 +50,6 @@ jobs: run: | uv venv uv sync --all-extras --dev - - name: Install Playwright Browsers - run: | - PLAYWRIGHT_VERSION=$(grep -E '^playwright = "[^"]*"' pyproject.toml | sed -E 's/playwright = "([^"]*)".*$/\1/') - npx playwright@$PLAYWRIGHT_VERSION install --with-deps - name: Run Tests run: | xvfb-run .venv/bin/python -m pytest ${{ github.event.inputs.pytest_command || '-m "not devRun"' }} \ From 277b7d18d2903a963ae2577f6a21cef371441c6b Mon Sep 17 00:00:00 2001 From: Nir Tal Date: Mon, 7 Apr 2025 17:16:08 +0300 Subject: [PATCH 2/3] docker --- .github/workflows/devRun.yml | 2 +- .github/workflows/nightly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/devRun.yml b/.github/workflows/devRun.yml index cdb359cd9..3dcb2a216 100644 --- a/.github/workflows/devRun.yml +++ b/.github/workflows/devRun.yml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-latest container: - image: mcr.microsoft.com/playwright:v1.51-jammy + image: mcr.microsoft.com/playwright:v1.51.0-jammy steps: - uses: actions/checkout@v4 - name: Set up Python diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9928b55a6..e15c780d3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -32,7 +32,7 @@ jobs: needs: setup-matrix runs-on: ubuntu-latest container: - image: mcr.microsoft.com/playwright:v1.51-jammy + image: mcr.microsoft.com/playwright:v1.51.0-jammy strategy: fail-fast: false matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} From f4521fe56f4f40ed12a63ea44f8750688b12c1e1 Mon Sep 17 00:00:00 2001 From: Nir Tal Date: Mon, 7 Apr 2025 17:20:02 +0300 Subject: [PATCH 3/3] docker --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 90352e1d1..c4a1ae59e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ addopts = [ "tms:https://{}", "-ra", "--color=yes", - "--browser-channel=chrome", + "--browser=chromium", "--headed", "--video=retain-on-failure", "--tracing=retain-on-failure"