Format and fix tidy CI

This commit is contained in:
Shaun Reed 2022-11-20 10:00:30 -05:00
parent 606d6486f4
commit 79a5919df9
3 changed files with 23 additions and 8 deletions

View File

@ -11,6 +11,14 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
version: '6.3.1'
- name: Install Assimp Ubuntu
run: sudo apt install libassimp-dev
- name: Build Qtk - name: Build Qtk
run: | run: |
cmake -B build && cmake --build build cmake -B build && cmake --build build

View File

@ -87,8 +87,15 @@ cd build
clang-tidy --fix --config-file=../.clang-tidy ../src/*.cpp ../src/*.h ../app/*.cpp ../app/*.h clang-tidy --fix --config-file=../.clang-tidy ../src/*.cpp ../src/*.h ../app/*.cpp ../app/*.h
``` ```
And finally `clang-format` can be run with git integration (or CLion if you prefer). Last we need to run `clang-format`, this can be done with the command directly.
Don't forget to commit the reformatted files. This will reformat all the code in the repository.
```bash
clang-format -i --style=file:.clang-format src/*.cpp src/*.h app/*.cpp app/*.h
```
`clang-format` can be run with git integration (or CLion if you prefer).
Git will only reformat the lines you modified, which can be useful.
```bash ```bash
# If we want to format the last N commits # If we want to format the last N commits

View File

@ -11,13 +11,13 @@
#include <QtCore/QtGlobal> #include <QtCore/QtGlobal>
#ifdef QTK_SHARED #ifdef QTK_SHARED
# if defined(QTK_EXPORT) #if defined(QTK_EXPORT)
# define QTKAPI Q_DECL_EXPORT #define QTKAPI Q_DECL_EXPORT
# else
# define QTKAPI Q_DECL_IMPORT
# endif
#else #else
# define QTKAPI #define QTKAPI Q_DECL_IMPORT
#endif
#else
#define QTKAPI
#endif #endif
#endif // QTK_QTKAPI_H #endif // QTK_QTKAPI_H