Skip to content

Commit fbb4806

Browse files
authored
Merge branch 'main' into discover-dhcp-camera-outside-subnet
2 parents 8340141 + 1d4c7fc commit fbb4806

19 files changed

+554
-218
lines changed

.clang-format

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
2+
# Glib has formatting at https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
3+
# https://gitlab.gnome.org/GNOME/glib/-/blob/main/.clang-format
4+
# But we do not follow it fully
5+
BasedOnStyle: GNU
6+
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
7+
AllowShortLoopsOnASingleLine: true
8+
BinPackParameters: false
9+
BreakBeforeBinaryOperators: None
10+
BreakBeforeBraces: Linux
11+
BreakBeforeTernaryOperators: false
12+
ColumnLimit: 0
13+
ContinuationIndentWidth: 8
14+
Cpp11BracedListStyle: false
15+
FixNamespaceComments: false
16+
IndentCaseLabels: true
17+
IndentGotoLabels: false
18+
IndentWidth: 8
19+
SeparateDefinitionBlocks: Always
20+
SortIncludes: Never
21+
SpaceAfterCStyleCast: true
22+
SpaceBeforeParens: Always
23+
UseTab: Always

.github/workflows/aravis-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main, aravis-0-8 ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, aravis-0-8 ]
88
release:
99
workflow_dispatch:
1010

.github/workflows/aravis-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Aravis-macOS
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, aravis-0-8 ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, aravis-0-8 ]
88
release:
99
workflow_dispatch:
1010

.github/workflows/aravis-mingw.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Aravis-MinGW
55

66
on:
77
push:
8-
branches: [ main ]
8+
branches: [ main, aravis-0-8 ]
99
pull_request:
10-
branches: [ main ]
10+
branches: [ main, aravis-0-8 ]
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/aravis-msvc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Aravis-MSVC
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, aravis-0-8 ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, aravis-0-8 ]
88
workflow_dispatch:
99

1010
jobs:

0 commit comments

Comments
 (0)