Skip to content

Commit f140e2d

Browse files
authored
Merge pull request #5596 from NomicFoundation/galargh/merge-queue
ci: enable merge queue on the v-next branch
2 parents 1b1c69e + e460231 commit f140e2d

File tree

1 file changed

+35
-0
lines changed

1 file changed

+35
-0
lines changed

.github/workflows/v-next-ci.yml

+35
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: vNext CI
22

33
on:
4+
merge_group:
45
push:
56
branches:
67
- v-next
@@ -108,6 +109,23 @@ jobs:
108109
- name: Lint
109110
run: pnpm lint
110111

112+
lint-aggregate:
113+
needs: lint
114+
115+
if: ${{ !cancelled() }}
116+
117+
name: lint
118+
runs-on: ubuntu-latest
119+
120+
steps:
121+
- env:
122+
result: ${{ needs.lint.result }}
123+
run: |
124+
if [[ "$result" == "failure" ]]; then
125+
exit 1
126+
fi
127+
shell: bash
128+
111129
ci:
112130
needs: list-packages
113131

@@ -137,3 +155,20 @@ jobs:
137155
run: pnpm build
138156
- name: Run tests
139157
run: pnpm run test
158+
159+
ci-aggregate:
160+
needs: ci
161+
162+
if: ${{ !cancelled() }}
163+
164+
name: ci
165+
runs-on: ubuntu-latest
166+
167+
steps:
168+
- env:
169+
result: ${{ needs.ci.result }}
170+
run: |
171+
if [[ "$result" == "failure" ]]; then
172+
exit 1
173+
fi
174+
shell: bash

0 commit comments

Comments
 (0)