Skip to content

Commit 51b3a74

Browse files
authored
Merge pull request #1998 from peternewman/0.10-clang-latest
Temporarily remove whitespace/indent_namespace from cpplint
2 parents c5b5428 + 9046e4d commit 51b3a74

File tree

6 files changed

+36
-9
lines changed

6 files changed

+36
-9
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: build
22
on: [push, pull_request]
3+
4+
permissions:
5+
contents: read
6+
37
jobs:
48
build:
59
name: "${{ matrix.id }}"
@@ -57,6 +61,8 @@ jobs:
5761
- name: Install Git
5862
run: apt-get -y install git
5963
- uses: actions/checkout@v4
64+
with:
65+
persist-credentials: false
6066
- name: Install build tools
6167
shell: bash
6268
run: |
@@ -114,7 +120,8 @@ jobs:
114120
# actually exclude it, so it must first be touched
115121
run: |
116122
touch ola-${{ matrix.id }}-source-tree.tar.gz
117-
tar --exclude=ola-${{ matrix.id }}-source-tree.tar.gz -cvzf ola-${{ matrix.id }}-source-tree.tar.gz .
123+
touch .git
124+
tar --exclude=ola-${{ matrix.id }}-source-tree.tar.gz --exclude=.git -cvzf ola-${{ matrix.id }}-source-tree.tar.gz .
118125
- name: SHA256 artifact archives
119126
if: always()
120127
run: sha256sum ola-*.tar.gz

.github/workflows/debian.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
name: debian
55
on: [push, pull_request]
6+
7+
permissions:
8+
contents: read
9+
610
jobs:
711
debian-build:
812
name: 'Debian Build ${{ matrix.image_tag }} ${{ matrix.architecture }}'
@@ -28,6 +32,8 @@ jobs:
2832
- name: Install Git
2933
run: apt-get -y install git
3034
- uses: actions/checkout@v4
35+
with:
36+
persist-credentials: false
3137
- name: Install build tools
3238
run: apt-get -y install devscripts adduser fakeroot sudo
3339
- name: Install build dependencies
@@ -70,7 +76,9 @@ jobs:
7076
architecture: [amd64]
7177
container: debian:${{ matrix.image_tag }}
7278
steps:
73-
- uses: actions/checkout@master
79+
- uses: actions/checkout@v4
80+
with:
81+
persist-credentials: false
7482
- name: Download build artifact
7583
uses: actions/download-artifact@v4
7684
with:

.github/workflows/isort.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
name: isort
22

3-
on:
4-
- push
5-
- pull_request
3+
on: [push, pull_request]
4+
5+
permissions:
6+
contents: read
67

78
jobs:
89
isort:
910
runs-on: ubuntu-latest
1011
steps:
1112
- uses: actions/checkout@v4
13+
with:
14+
persist-credentials: false
1215
- uses: isort/isort-action@v1

.github/workflows/lint.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: lint
22
on: [push, pull_request]
3+
4+
permissions:
5+
contents: read
6+
37
jobs:
48
build:
59
name: Build for Lint Tasks
@@ -17,6 +21,8 @@ jobs:
1721
- name: Install Git
1822
run: apt-get -y install git
1923
- uses: actions/checkout@v4
24+
with:
25+
persist-credentials: false
2026
- name: Install build tools
2127
shell: bash
2228
run: |
@@ -53,7 +59,8 @@ jobs:
5359
# actually exclude it, so it must first be touched
5460
run: |
5561
touch ola-debian-stable-built-source-tree.tar.gz
56-
tar --exclude=ola-debian-stable-built-source-tree.tar.gz -cvzf ola-debian-stable-built-source-tree.tar.gz .
62+
touch .git
63+
tar --exclude=ola-debian-stable-built-source-tree.tar.gz --exclude=.git -cvzf ola-debian-stable-built-source-tree.tar.gz .
5764
- name: SHA256 artifact archive
5865
run: sha256sum ola-debian-stable-built-source-tree.tar.gz
5966
- uses: actions/upload-artifact@v4
@@ -261,6 +268,8 @@ jobs:
261268
runs-on: ubuntu-latest
262269
steps:
263270
- uses: actions/checkout@v4
271+
with:
272+
persist-credentials: false
264273
- name: Setup Node.js v18
265274
uses: actions/setup-node@v3
266275
with:

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ else
246246
endif
247247

248248
# cpplint linter
249-
CPP_LINT_FILTER = "-legal/copyright,-readability/streams,-runtime/arrays"
249+
CPP_LINT_FILTER = "-legal/copyright,-readability/streams,-runtime/arrays,-whitespace/indent_namespace"
250250
CPP_LINT_FILES = $(shell find . \( -name "*.h" -or -name "*.cpp" \) -and ! \( \
251251
-wholename "./common/protocol/Ola.pb.*" -or \
252252
-wholename "./common/rpc/Rpc.pb.*" -or \

include/ola/rdm/RDMAPI.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (C) 2010 Simon Newton
1919
*
2020
* This class provides a high level C++ RDM API for PIDs defined in
21-
* E1.20. It includes errors checking for out-of-range arguments. Each RDM
21+
* E1.20. It includes error checking for out-of-range arguments. Each RDM
2222
* method takes a pointer to a string, which will be populated with an English
2323
* error message if the command fails.
2424
*/
@@ -31,7 +31,7 @@
3131
*
3232
* This class provides a high level C++ RDM API for PIDS defined in E1.20. It
3333
* includes error checking for out-of-range arguments. Each RDM method takes a
34-
* pointer to a string, which will be populated with an english error message
34+
* pointer to a string, which will be populated with an English error message
3535
* if the command fails.
3636
* @}
3737
*

0 commit comments

Comments
 (0)