Skip to content

Commit ec55d94

Browse files
committed
final version v2
1 parent 01f2a4d commit ec55d94

File tree

4 files changed

+3
-19
lines changed

4 files changed

+3
-19
lines changed

.github/workflows/reusable_checks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Basic checks on the code, incl. coding style, spelling, bandit analysis.
2-
# TODO: add license check
32
name: Basic checks
43

54
on: workflow_call

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,6 @@ else()
175175
add_custom_target(jemalloc_prod
176176
DEPENDS ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)
177177

178-
add_custom_target(
179-
check-license
180-
COMMAND ${UMF_CMAKE_SOURCE_DIR}/check_license/check-headers.sh
181-
${UMF_CMAKE_SOURCE_DIR} Apache-2.0 WITH LLVM-exception -v)
182-
add_custom_target(
183-
copyright-format
184-
COMMAND ${UMF_CMAKE_SOURCE_DIR}/check_license/check-headers.sh
185-
${UMF_CMAKE_SOURCE_DIR} Apache-2.0 WITH LLVM-exception -d)
186-
187178
add_library(jemalloc INTERFACE)
188179
target_link_libraries(
189180
jemalloc INTERFACE ${jemalloc_targ_BINARY_DIR}/lib/libjemalloc.a)

check_license/check-headers.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ else
8484
GIT_COMMAND="diff --name-only $MERGE_BASE $CURRENT_COMMIT"
8585
fi
8686

87-
chmod +x "${SOURCE_ROOT}/check_license/file-exceptions.sh"
88-
8987
FILES=$($GIT $GIT_COMMAND | ${SOURCE_ROOT}/check_license/file-exceptions.sh)
9088

9189
RV=0
@@ -188,5 +186,4 @@ if [ $RV -eq 0 ]; then
188186
else
189187
echo "Error(s) in copyright headers found!" >&2
190188
fi
191-
exit $RV
192-
189+
exit $RV

check_license/file-exceptions.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

66
# You can add an exception file
7-
grep -v -E -e '/src/uthash/.*' \
7+
grep -v -E -e 'src/uthash/.*' \
88
-e 'benchmark/ubench.h' \
99
-e 'include/umf/proxy_lib_new_delete.h' \
1010
-e 'scripts/docs_config/conf.py' \
@@ -17,7 +17,7 @@ grep -v -E -e '/src/uthash/.*' \
1717
-e 'CODEOWNERS$' \
1818
-e 'scripts/assets/images/.*' \
1919
-e 'scripts/docs_config/.*' \
20-
-e 'scripts/qemu/configs/.*' \
20+
-e '\.xml$' \
2121
-e '\.txt$' \
2222
-e 'test/supp/.*' \
2323
-e '\.json$' \
@@ -29,6 +29,3 @@ grep -v -E -e '/src/uthash/.*' \
2929
-e 'ChangeLog' \
3030
-e '\.cmake.in$' \
3131
-e '\.patch$'
32-
33-
34-

0 commit comments

Comments
 (0)