Skip to content

Commit 4937562

Browse files
bors[bot]dkm
andauthored
Merge #331
331: Initial bors-ng integration r=philberty a=dkm Github Action only triggered on bors-ng controlled branches (trying/staging). Fixes #324 Co-authored-by: Marc Poulhiès <[email protected]>
2 parents 2800f44 + 777ef8a commit 4937562

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/bors.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
status = [
2+
"build-and-check", "clang-format"
3+
]
4+
# Uncomment this to use a two hour timeout.
5+
# The default is one hour.
6+
#timeout_sec = 7200

.github/workflows/ccpp.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ name: C/C++ CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- trying
7+
- staging
68
pull_request:
79
branches: [ master ]
810

911
jobs:
10-
build:
12+
build-and-check:
1113

1214
runs-on: ubuntu-latest
1315

.github/workflows/clang-format.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ name: Clang Format Lint
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- trying
7+
- staging
68
pull_request:
79
branches: [ master ]
810

911
jobs:
10-
build:
12+
clang-format:
1113
runs-on: ubuntu-latest
1214

1315
steps:

0 commit comments

Comments
 (0)