Skip to content

Commit 3050662

Browse files
committed
chore: cleanup
1 parent 20d16f0 commit 3050662

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

.devcontainer/ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ RUN ["dash", "-c", "\
6969
valgrind \
7070
&& pip install --break-system-packages \
7171
breathe \
72-
sphinx-rtd-theme \
7372
scancode-toolkit \
73+
sphinx-rtd-theme \
7474
&& apt-get clean \
7575
&& apt-get purge \
7676
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \

.vscode/tasks.json

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,44 +55,44 @@
5555
}
5656
},
5757
{
58-
"label": "Note-C: Run `astyle` Formatter",
58+
"label": "Note-C: Generate Coverage HTML",
5959
"type": "shell",
60-
"command": "./scripts/run_astyle.sh",
60+
"command": "genhtml lcov.info -o tmp",
6161
"args": [],
6262
"options": {
63-
"cwd": "${workspaceFolder}",
63+
"cwd": "${workspaceFolder}/build/test/coverage",
6464
"env": {
6565
"LC_ALL": "C"
6666
}
6767
},
6868
"problemMatcher": [],
6969
"group": {
7070
"kind": "none"
71-
}
71+
},
72+
"dependsOn": [
73+
"Note-C: Compile and Run ALL Tests (with coverage)"
74+
]
7275
},
7376
{
74-
"label": "Note-C: Generate Coverage HTML",
77+
"label": "Note-C: Generate Documentation",
7578
"type": "shell",
76-
"command": "genhtml lcov.info -o tmp",
79+
"command": "./scripts/build_docs.sh",
7780
"args": [],
7881
"options": {
79-
"cwd": "${workspaceFolder}/build/test/coverage",
82+
"cwd": "${workspaceFolder}",
8083
"env": {
8184
"LC_ALL": "C"
8285
}
8386
},
8487
"problemMatcher": [],
8588
"group": {
8689
"kind": "none"
87-
},
88-
"dependsOn": [
89-
"Note-C: Compile and Run ALL Tests (with coverage)"
90-
]
90+
}
9191
},
9292
{
93-
"label": "Note-C: Generate Documentation",
93+
"label": "Note-C: Run `astyle` Formatter",
9494
"type": "shell",
95-
"command": "./scripts/build_docs.sh",
95+
"command": "./scripts/run_astyle.sh",
9696
"args": [],
9797
"options": {
9898
"cwd": "${workspaceFolder}",
@@ -106,32 +106,31 @@
106106
}
107107
},
108108
{
109-
"label": "Note-C: Run Static Analysis",
109+
"label": "Note-C: Run License Compliance Check",
110110
"type": "shell",
111-
"command": "${workspaceFolder}/scripts/run_cppcheck.sh",
111+
"command": "${workspaceFolder}/scripts/run_scancode.sh",
112112
"options": {
113113
"cwd": "${workspaceFolder}",
114114
"env": {
115115
"LC_ALL": "C"
116116
}
117117
},
118-
"problemMatcher": [
119-
"$gcc"
120-
],
118+
"problemMatcher": [],
121119
"group": "test"
122-
}
123-
,
120+
},
124121
{
125-
"label": "Note-C: Run License Compliance Check",
122+
"label": "Note-C: Run Static Analysis",
126123
"type": "shell",
127-
"command": "${workspaceFolder}/scripts/run_scancode.sh",
124+
"command": "${workspaceFolder}/scripts/run_cppcheck.sh",
128125
"options": {
129126
"cwd": "${workspaceFolder}",
130127
"env": {
131128
"LC_ALL": "C"
132129
}
133130
},
134-
"problemMatcher": [],
131+
"problemMatcher": [
132+
"$gcc"
133+
],
135134
"group": "test"
136135
}
137136
]

scripts/run_scancode.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eo pipefail
2+
set -exo pipefail
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
55
SRC_DIR="$SCRIPT_DIR/.."
@@ -94,8 +94,10 @@ scancode \
9494
--tallies \
9595
--json-pp scancode_output.json \
9696
--timeout 120 \
97-
--processes 2 \
98-
. 2>&1 | tee scancode_console_output.txt
97+
--processes 4 \
98+
--ignore "build/*" \
99+
--verbose \
100+
$SRC_DIR 2>&1 | tee scancode_console_output.txt
99101

100102
generate_summary
101103

0 commit comments

Comments
 (0)