Skip to content

Commit f6c8930

Browse files
authored
Run E2Es on merge_group events (#9806)
1 parent df04528 commit f6c8930

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/e2e.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout Repo
31-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
31+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
3232
uses: actions/checkout@v4
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Install Dependencies
37-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
37+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
3838
uses: ./.github/actions/install-dependencies
3939
with:
4040
node-version: ${{ matrix.node }}
@@ -44,13 +44,13 @@ jobs:
4444
turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
4545

4646
- name: Bump package versions
47-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
47+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
4848
run: node .github/changeset-version.js
4949
env:
5050
GITHUB_TOKEN: ${{ github.token }}
5151

5252
- name: Run Wrangler E2E tests
53-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
53+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
5454
run: pnpm run test:e2e:wrangler
5555
env:
5656
CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }}
@@ -92,13 +92,13 @@ jobs:
9292
runs-on: ${{ matrix.os }}
9393
steps:
9494
- name: Checkout Repo
95-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
95+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
9696
uses: actions/checkout@v4
9797
with:
9898
fetch-depth: 0
9999

100100
- name: Install Dependencies
101-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
101+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
102102
uses: ./.github/actions/install-dependencies
103103
with:
104104
node-version: ${{ matrix.node }}
@@ -108,13 +108,13 @@ jobs:
108108
turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
109109

110110
- name: Bump package versions
111-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
111+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
112112
run: node .github/changeset-version.js
113113
env:
114114
GITHUB_TOKEN: ${{ github.token }}
115115

116116
- name: Run Vite E2E tests
117-
if: github.event.pull_request.head.repo.owner.login == 'cloudflare'
117+
if: github.event.pull_request.head.repo.owner.login == 'cloudflare' || github.event_name == 'merge_group'
118118
run: pnpm test:e2e -F @cloudflare/vite-plugin --log-order=stream
119119
timeout-minutes: 15
120120
env:

0 commit comments

Comments
 (0)