From 50a5c494b67879dd19f6258a13ae0d915e59802d Mon Sep 17 00:00:00 2001 From: Gal Ziv Date: Wed, 8 Apr 2026 18:28:07 +0300 Subject: [PATCH] Run phase7 e2e before merge Ensure the phase7-e2e workflow job runs on pull_request and push events instead of only merge_group, so it can be required by branch protection before merging. Also update the pytest marker description to reflect required pre-merge CI. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed65646..51309fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: run: .venv/bin/python -m pytest tests/ -v -m "not e2e" phase7-e2e: - if: github.event_name == 'merge_group' + name: phase7-e2e runs-on: ubuntu-latest steps: diff --git a/pyproject.toml b/pyproject.toml index 4484ef0..e84f19e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ testpaths = ["tests"] addopts = "--cov=github_pr_kb --cov-report=term-missing" markers = [ "integration: marks tests that call the real GitHub API (skipped unless RUN_INTEGRATION_TESTS=1)", - "e2e: marks deterministic CLI end-to-end harness tests intended for merge-queue CI", + "e2e: marks deterministic CLI end-to-end harness tests intended for required pre-merge CI", ] [tool.ruff]