Skip to content

Commit ebc028f

Browse files
authored
Require more jobs in merge queue (#102)
To re-enable the merge queue, this change adds merge_group to several jobs. original: line/line-bot-sdk-java#1592
1 parent 0e669d0 commit ebc028f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Basic CI
22

33
on:
44
push:
5-
branches: [ "main" ]
65
pull_request:
7-
branches: [ "main" ]
6+
merge_group:
7+
workflow_dispatch:
88

99
jobs:
1010
setup:

.github/workflows/sdk-testing.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
name: SDK Test Automation
22

33
on:
4+
push:
5+
branches:
6+
- main
47
pull_request:
58
branches:
69
- main
10+
merge_group:
11+
workflow_dispatch:
712

813
jobs:
914
test-java:

0 commit comments

Comments
 (0)