Skip to content

Commit 2ed39ef

Browse files
authored
ci: add dco workaround, run tests for merge queues (#740)
Signed-off-by: Michael Beemer <beeme1mr@users.noreply.github.com>
1 parent 0038e45 commit 2ed39ef

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/dco-merge-group.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: DCO
2+
on:
3+
merge_group:
4+
5+
# Workaround because the DCO app doesn't run on a merge_group trigger
6+
# https://github.com/dcoapp/app/pull/200
7+
jobs:
8+
DCO:
9+
runs-on: ubuntu-latest
10+
if: ${{ github.actor != 'renovate[bot]' }}
11+
steps:
12+
- run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue"

.github/workflows/pr-checks.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ on:
44
push:
55
branches:
66
- main
7-
paths-ignore:
8-
- '**.md'
97
pull_request:
10-
paths-ignore:
11-
- '**.md'
8+
types:
9+
- opened
10+
- synchronize
11+
- reopened
12+
branches:
13+
- main
14+
merge_group:
1215

1316
permissions:
1417
contents: read

0 commit comments

Comments
 (0)