diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d31aeed5..b3c71857 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ jobs: skip-artifact: false skip-crashpad: false build-deb: true + plugins: true - os: ubuntu-24.04 container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest qt-version: 6.7.2 @@ -46,6 +47,15 @@ jobs: skip-artifact: false skip-crashpad: false build-deb: true + plugins: true + - os: ubuntu-24.04 + container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest + qt-version: 6.7.2 + force-lto: false + skip-artifact: false + skip-crashpad: false + build-deb: false + plugins: false env: C2_ENABLE_LTO: ${{ matrix.force-lto }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} @@ -84,6 +94,7 @@ jobs: -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCHATTERINO_STATIC_QT_BUILD=On \ -DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-24.04' && 'On' || 'Off'}} \ + -DCHATTERINO_PLUGINS=${{ matrix.plugins && 'On' || 'Off' }} \ .. make -j"$(nproc)" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bc79e10..70be5854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Minor: Consolidate font picking into one dialog. (#6531) - Minor: Added a menu action to sort tabs alphabetically. (#6551) - Minor: Fixed "edit hotkey" dialog opening like a normal window. (#6540) -- Minor: Added an API to get the current Twitch account in plugins. (#6554) +- Minor: Added an API to get the current Twitch account in plugins. (#6554, #6675) - Minor: Added options to close multiple visible tabs. (#6515, #6619) - Minor: Added a setting to show the stream title in live messages. (#6572) - Minor: Add categories to the emoji viewer. (#6598) diff --git a/src/controllers/plugins/api/Accounts.cpp b/src/controllers/plugins/api/Accounts.cpp index 44e8d7ae..79908cec 100644 --- a/src/controllers/plugins/api/Accounts.cpp +++ b/src/controllers/plugins/api/Accounts.cpp @@ -1,14 +1,16 @@ #include "controllers/plugins/api/Accounts.hpp" -#include "Application.hpp" -#include "controllers/accounts/AccountController.hpp" -#include "controllers/plugins/SolTypes.hpp" // IWYU pragma: keep -#include "providers/twitch/TwitchAccount.hpp" -#include "util/WeakPtrHelpers.hpp" +#ifdef CHATTERINO_HAVE_PLUGINS -#include +# include "Application.hpp" +# include "controllers/accounts/AccountController.hpp" +# include "controllers/plugins/SolTypes.hpp" // IWYU pragma: keep +# include "providers/twitch/TwitchAccount.hpp" +# include "util/WeakPtrHelpers.hpp" -#include +# include + +# include namespace { @@ -95,3 +97,5 @@ void createAccounts(sol::table &c2) } } // namespace chatterino::lua::api + +#endif