walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Test GUI build CMake in CI (#3621)

This commit is contained in:
Oliver Stöneberg 2021-12-15 19:36:34 +01:00 committed by GitHub
parent 16110b6157
commit dafb2fe6a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/CI-unixish-docker.yml vendored
View File

@ -40,7 +40,7 @@ jobs:
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output
cmake -G "Unix Makefiles" -DHAVE_RULES=On .. cmake -G "Unix Makefiles" -DHAVE_RULES=On ..
make -j$(nproc) cmake --build . -- -j$(nproc)
cd .. cd ..
- name: Test CMake build - name: Test CMake build
@ -49,7 +49,7 @@ jobs:
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output
cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On .. cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On ..
make -j$(nproc) check cmake --build . --target check -- -j$(nproc)
cd .. cd ..
- name: Build cppcheck - name: Build cppcheck

18
.github/workflows/CI-unixish.yml vendored
View File

@ -49,17 +49,27 @@ jobs:
python -m pip install pytest python -m pip install pytest
- name: Install Qt - name: Install Qt
if: contains(matrix.os, 'ubuntu')
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '5.15.2'
modules: 'qtcharts' modules: 'qtcharts'
- name: Test CMake build - name: Test CMake build (with GUI)
run: | run: |
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output
cmake -G "Unix Makefiles" -DUSE_Z3=On -DHAVE_RULES=On -DBUILD_TESTS=On .. cmake -G "Unix Makefiles" -DUSE_Z3=On -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On ..
make -j$(nproc) check cmake --build . -- -j$(nproc)
cd ..
- name: Run CMake test
run: |
cmake --build cmake.output --target check -- -j$(nproc)
- name: Run CTest
run: |
cd cmake.output
ctest -j$(nproc)
cd .. cd ..
- name: Build and test with Unsigned char - name: Build and test with Unsigned char

2
.github/workflows/clang-tidy.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
run: | run: |
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output
cmake -G "Unix Makefiles" -DUSE_Z3=On -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On .. cmake -G "Unix Makefiles" -DUSE_Z3=On -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On ..
cd .. cd ..
- name: Clang-Tidy - name: Clang-Tidy

2
.github/workflows/format.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release .. cmake -DCMAKE_BUILD_TYPE=Release ..
make -j$(nproc) -s cmake --build . -- -j$(nproc) -s
mkdir ~/uncrustify mkdir ~/uncrustify
cp uncrustify ~/uncrustify/ cp uncrustify ~/uncrustify/

9
gui/translationhandler.cpp
View File

@ -31,19 +31,10 @@
static void unused() static void unused()
{ {
// NOTE: Keeping semi-colons at end of macro for style preference // NOTE: Keeping semi-colons at end of macro for style preference
#if ((QT_VERSION >= 0x040000) && (QT_VERSION < 0x050000))
Q_UNUSED(QT_TRANSLATE_NOOP("QDialogButtonBox", "OK"));
Q_UNUSED(QT_TRANSLATE_NOOP("QDialogButtonBox", "Cancel"));
Q_UNUSED(QT_TRANSLATE_NOOP("QDialogButtonBox", "Close"));
Q_UNUSED(QT_TRANSLATE_NOOP("QDialogButtonBox", "Save"));
#elif ((QT_VERSION >= 0x050000) && (QT_VERSION < 0x060000))
Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "OK")); Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "OK"));
Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel")); Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel"));
Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Close")); Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Close"));
Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Save")); Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Save"));
#else
#error Unsupported Qt version.
#endif
} }
TranslationHandler::TranslationHandler(QObject *parent) : TranslationHandler::TranslationHandler(QObject *parent) :