Skip to content

Commit da2e46a

Browse files
piotrskiclaude
andcommitted
ci: run browser e2e tests in merge queue only
Adds the browser E2E job to ci.yml triggered by merge_group so it runs exactly once before a PR lands on main — not on every push. Removes the duplicate browser E2E steps from release.yml since nothing broken can reach main once the merge queue gate is in place. Requires enabling merge queue in repo Settings → Branches → branch protection for main, with "E2E tests (browser)" as a required check. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 7ba7a0f commit da2e46a

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main, changeset-release/main]
66
pull_request:
77
branches: [main]
8+
merge_group:
89

910
jobs:
1011
typecheck:
@@ -42,6 +43,20 @@ jobs:
4243
- run: bun run build
4344
- run: bun run --filter e2e-tests test:protocol
4445

46+
e2e-browser:
47+
name: E2E tests (browser)
48+
runs-on: ubuntu-latest
49+
if: github.event_name == 'merge_group'
50+
steps:
51+
- uses: actions/checkout@v4
52+
- uses: oven-sh/setup-bun@v2
53+
with:
54+
bun-version: latest
55+
- run: bun install
56+
- run: bun run build
57+
- run: npx --prefix packages/e2e-tests playwright install --with-deps chromium
58+
- run: bun run --filter e2e-tests test:browser
59+
4560
cli-smoke:
4661
name: CLI smoke test
4762
runs-on: ubuntu-latest

.github/workflows/release.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ jobs:
4141
- name: E2E tests (protocol)
4242
run: bun run --filter e2e-tests test:protocol
4343

44-
- name: Install Playwright
45-
run: npx --prefix packages/e2e-tests playwright install --with-deps chromium
46-
47-
- name: E2E tests (browser)
48-
run: bun run --filter e2e-tests test:browser
49-
5044
- name: Create release PR or publish
5145
id: changesets
5246
uses: changesets/action@v1

0 commit comments

Comments
 (0)