Skip to content

Commit 68bc69c

Browse files
committed
ci: add merge_group trigger to enable merge queue
1 parent 916bb88 commit 68bc69c

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
pull_request:
88
branches:
99
- master
10+
merge_group:
11+
branches:
12+
- master
1013

1114
jobs:
1215
build-multiarch:

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
needs: list-sysdig-secure-tests
5656
strategy:
57-
fail-fast: false
57+
fail-fast: true
5858
max-parallel: 20
5959
matrix:
6060
file: ${{ fromJson(needs.list-sysdig-secure-tests.outputs.matrix) }}
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ubuntu-latest
103103
needs: list-sysdig-monitor-tests
104104
strategy:
105-
fail-fast: false
105+
fail-fast: true
106106
max-parallel: 20
107107
matrix:
108108
file: ${{ fromJson(needs.list-sysdig-monitor-tests.outputs.matrix) }}
@@ -150,7 +150,7 @@ jobs:
150150
runs-on: ubuntu-latest
151151
needs: list-ibm-monitor-tests
152152
strategy:
153-
fail-fast: false
153+
fail-fast: true
154154
max-parallel: 3
155155
matrix:
156156
file: ${{ fromJson(needs.list-ibm-monitor-tests.outputs.matrix) }}
@@ -201,7 +201,7 @@ jobs:
201201
runs-on: ubuntu-latest
202202
needs: list-ibm-secure-tests
203203
strategy:
204-
fail-fast: false
204+
fail-fast: true
205205
max-parallel: 3
206206
matrix:
207207
file: ${{ fromJson(needs.list-ibm-secure-tests.outputs.matrix) }}

0 commit comments

Comments
 (0)