From 168192b731baf0a3d549a8b27f853ea009e680e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Borz=C3=AC?= Date: Thu, 21 Sep 2023 12:43:57 +0200 Subject: [PATCH] fix(CI): cppcheck failure step (#17240) * feat: add cppcheck for scripts * fix: cppcheck step failure * trigger cppcheck build, it should fail * fix: cppcheck should succeed * fix: cppcheck --- .github/workflows/cpp-check.yml | 15 ++++++--------- .suppress.cppcheck | 1 + src/server/apps/authserver/Server/AuthSession.h | 1 + src/server/game/Server/Packets/MiscPackets.h | 3 +++ 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .suppress.cppcheck diff --git a/.github/workflows/cpp-check.yml b/.github/workflows/cpp-check.yml index a4305fac54..ea1f7adbb3 100644 --- a/.github/workflows/cpp-check.yml +++ b/.github/workflows/cpp-check.yml @@ -26,12 +26,9 @@ jobs: run: | sudo apt update -y sudo apt install -y cppcheck - cppcheck --force --inline-suppr \ - -i src/server/game/Achievements/AchievementMgr.cpp \ - -i src/server/game/AuctionHouse/AuctionHouseMgr.cpp \ - -i src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp \ - -i src/server/game/DungeonFinding/LFGMgr.cpp \ - -i src/server/game/Entities/GameObject/GameObject.cpp \ - -i src/server/game/Entities/Pet/Pet.cpp \ - -i src/server/game/Entities/Player/Player.cpp \ - src/ + cppcheck --force --inline-suppr --suppressions-list=./.suppress.cppcheck src/ --output-file=report.txt + + if [ -s report.txt ]; then # if file is not empty + cat report.txt + exit 1 # let github action fails + fi diff --git a/.suppress.cppcheck b/.suppress.cppcheck new file mode 100644 index 0000000000..a29d5a5896 --- /dev/null +++ b/.suppress.cppcheck @@ -0,0 +1 @@ +cppcheckError diff --git a/src/server/apps/authserver/Server/AuthSession.h b/src/server/apps/authserver/Server/AuthSession.h index 4a333c8168..fe19cf8092 100644 --- a/src/server/apps/authserver/Server/AuthSession.h +++ b/src/server/apps/authserver/Server/AuthSession.h @@ -45,6 +45,7 @@ enum AuthStatus STATUS_CLOSED }; +// cppcheck-suppress ctuOneDefinitionRuleViolation struct AccountInfo { void LoadResult(Field* fields); diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index 7097596ada..52c45ba630 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -57,6 +57,7 @@ namespace WorldPackets class AC_GAME_API PlayMusic final : public ServerPacket { public: + // cppcheck-suppress missingReturn PlayMusic() : ServerPacket(SMSG_PLAY_MUSIC, 4) { } PlayMusic(uint32 soundKitID) : ServerPacket(SMSG_PLAY_MUSIC, 4), SoundKitID(soundKitID) { } @@ -68,6 +69,7 @@ namespace WorldPackets class AC_GAME_API PlayObjectSound final : public ServerPacket { public: + // cppcheck-suppress missingReturn PlayObjectSound() : ServerPacket(SMSG_PLAY_OBJECT_SOUND, 4 + 8) { } PlayObjectSound(ObjectGuid const& sourceObjectGUID, uint32 soundKitID) : ServerPacket(SMSG_PLAY_OBJECT_SOUND, 4 + 8), SourceObjectGUID(sourceObjectGUID), SoundKitID(soundKitID) { } @@ -82,6 +84,7 @@ namespace WorldPackets class AC_GAME_API Playsound final : public ServerPacket { public: + // cppcheck-suppress missingReturn Playsound() : ServerPacket(SMSG_PLAY_SOUND, 4) { } Playsound(uint32 soundKitID) : ServerPacket(SMSG_PLAY_SOUND, 4), SoundKitID(soundKitID) { }