Merge pull request #65 from nanaian/lint-fix

Lint fix
This commit is contained in:
Ethan Roseman 2020-10-13 16:17:10 -04:00 committed by GitHub
commit c4b187f14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 17 deletions

View File

@ -1,2 +1,2 @@
Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,-clang-diagnostic-error' Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter'
HeaderFilterRegex: '(src|include)\/.*\.h' HeaderFilterRegex: '(src|include)\/.*\.h'

View File

@ -1,13 +1,11 @@
name: Lint name: Lint
on: on:
push:
paths:
- 'src/*'
- 'include/*'
pull_request: pull_request:
paths: paths:
- 'src/*' - 'src/*'
- 'include/*' - 'include/*'
- 'format.sh'
- '.clang-tidy'
jobs: jobs:
build: build:
@ -18,18 +16,9 @@ jobs:
- run: sudo apt-get install -y astyle clang-tidy - run: sudo apt-get install -y astyle clang-tidy
# lint files changed by the push/pr
- id: files
uses: trilom/file-changes-action@v1.2.4
with:
output: ' '
continue-on-error: true
- run: ./format.sh ${{ steps.files.outputs.files}}
if: ${{ steps.files.outcome == 'success' }}
- run: ./format.sh - run: ./format.sh
if: ${{ steps.files.outcome == 'failure' }}
# fail if any files were changed by ./format.sh # Detect any files changed by ./format.sh
- id: files_formatted - id: files_formatted
uses: jackton1/find-changed-files@v1.1 uses: jackton1/find-changed-files@v1.1
with: with:

View File

@ -33,4 +33,7 @@ astyle ${FILES} \
find ${FILES} -exec sed -i -e '$a\' {} \; find ${FILES} -exec sed -i -e '$a\' {} \;
# lint # lint
clang-tidy -p . ${FILES} -- ${COMPILER_OPTS} C_FILES=$(echo "$FILES" | grep '\.c$')
if [[ ! -z $C_FILES ]]; then
clang-tidy -p . ${C_FILES} -- ${COMPILER_OPTS}
fi

View File

@ -227,7 +227,8 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta
return newScript; return newScript;
} }
#else #else
INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority, s32 initialState); INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority,
s32 initialState);
#endif #endif
#ifdef NON_MATCHING #ifdef NON_MATCHING