diff --git a/.CI/full-ubuntu-build.sh b/.CI/full-ubuntu-build.sh index 114c3ffd..755dd2cc 100755 --- a/.CI/full-ubuntu-build.sh +++ b/.CI/full-ubuntu-build.sh @@ -27,7 +27,6 @@ cmake \ -DBUILD_BENCHMARKS="$BUILD_BENCHMARKS" \ -DUSE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \ - -DCHATTERINO_PLUGINS="$C2_PLUGINS" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCHATTERINO_STATIC_QT_BUILD=On \ -DCMAKE_CXX_FLAGS="-fno-sized-deallocation" \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 979d193f..8c492adc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,6 @@ jobs: container: ghcr.io/chatterino/chatterino2-build-ubuntu-20.04:latest qt-version: 6.7.2 force-lto: false - plugins: true skip-artifact: false skip-crashpad: false build-appimage: false @@ -45,7 +44,6 @@ jobs: container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest qt-version: 6.7.2 force-lto: false - plugins: true skip-artifact: false skip-crashpad: false build-appimage: true @@ -54,14 +52,12 @@ jobs: container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest qt-version: 6.7.2 force-lto: false - plugins: true skip-artifact: false skip-crashpad: false build-appimage: false build-deb: true env: C2_ENABLE_LTO: ${{ matrix.force-lto }} - C2_PLUGINS: ${{ matrix.plugins }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} steps: @@ -95,7 +91,6 @@ jobs: -DUSE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \ - -DCHATTERINO_PLUGINS="$C2_PLUGINS" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCHATTERINO_STATIC_QT_BUILD=On \ -DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-24.04' && 'On' || 'Off'}} \ @@ -144,21 +139,18 @@ jobs: - os: macos-14 qt-version: 6.7.1 force-lto: false - plugins: true skip-artifact: false skip-crashpad: false # Windows - os: windows-latest qt-version: 6.7.1 force-lto: false - plugins: true skip-artifact: false skip-crashpad: false fail-fast: false env: C2_ENABLE_LTO: ${{ matrix.force-lto }} - C2_PLUGINS: ${{ matrix.plugins }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} steps: @@ -239,7 +231,6 @@ jobs: -DUSE_PRECOMPILED_HEADERS=ON ` -DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" ` -DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" ` - -DCHATTERINO_PLUGINS="$Env:C2_PLUGINS" ` -DFORCE_JSON_GENERATION=On ` .. set cl=/MP @@ -308,7 +299,6 @@ jobs: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DUSE_PRECOMPILED_HEADERS=OFF \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \ - -DCHATTERINO_PLUGINS="$C2_PLUGINS" \ -DFORCE_JSON_GENERATION=Off \ .. make -j"$(sysctl -n hw.logicalcpu)" diff --git a/.github/workflows/test-arch-linux.yml b/.github/workflows/test-arch-linux.yml index 10a58638..a0788205 100644 --- a/.github/workflows/test-arch-linux.yml +++ b/.github/workflows/test-arch-linux.yml @@ -62,7 +62,6 @@ jobs: -DBUILD_TESTS=On \ -DBUILD_BENCHMARKS=On \ -DBUILD_APP=OFF \ - -DCHATTERINO_PLUGINS=On \ -DCMAKE_BUILD_TYPE=Debug \ .. working-directory: build-test diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 09a5dd3f..3399f84d 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -25,17 +25,11 @@ jobs: matrix: os: [macos-14] qt-version: [6.4.3, 6.7.1] - plugins: [true] fail-fast: false env: QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} steps: - - name: Enable plugin support - if: matrix.plugins - run: | - echo "C2_PLUGINS=ON" >> "$GITHUB_ENV" - - uses: actions/checkout@v4 with: submodules: recursive @@ -69,7 +63,6 @@ jobs: -DBUILD_TESTS=On \ -DBUILD_APP=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \ - -DCHATTERINO_PLUGINS="$C2_PLUGINS" \ .. make -j"$(sysctl -n hw.logicalcpu)" diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 4a6bd1ae..235d819d 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -24,7 +24,6 @@ jobs: matrix: os: [windows-latest] qt-version: [6.7.1] - plugins: [true] skip-artifact: [false] skip-crashpad: [false] fail-fast: false @@ -34,11 +33,6 @@ jobs: C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }} steps: - - name: Enable plugin support - if: matrix.plugins - run: | - echo "C2_PLUGINS=ON" >> "$Env:GITHUB_ENV" - - name: Set Crashpad if: matrix.skip-crashpad == false run: | @@ -121,7 +115,6 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" ` -DUSE_PRECOMPILED_HEADERS=On ` -DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" ` - -DCHATTERINO_PLUGINS="$Env:C2_PLUGINS" ` .. set cl=/MP nmake /S /NOLOGO diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ea4c773..8b043c13 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,10 +30,7 @@ jobs: - os: "ubuntu-22.04" container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest qt-version: 6.7.1 - plugins: true fail-fast: false - env: - C2_PLUGINS: ${{ matrix.plugins }} steps: - uses: actions/checkout@v4 @@ -62,7 +59,6 @@ jobs: -DBUILD_TESTS=On \ -DBUILD_BENCHMARKS=On \ -DBUILD_APP=OFF \ - -DCHATTERINO_PLUGINS="$C2_PLUGINS" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCHATTERINO_STATIC_QT_BUILD=On \ -DCHATTERINO_GENERATE_COVERAGE=On \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8a6041..743ab415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ - Dev: Updated `qtkeychain` to 0.15.0. (#5871) - Dev: Updated `googletest` to 1.16.0. (#5942) - Dev: Fixed duplicate CMake configure in clean builds. (#5940) +- Dev: Enable plugins in builds by default. (#6075) - Dev: BTTV emotes are now loaded as WEBP. (#5957) - Dev: Reduced time we wait for PubSub connections to cleanly exit from 1s to 100ms. (#6019) - Dev: Build with Qt 6.4.3 in CI. (#6032) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bd0c810..2789ee28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF) option(BUILD_TRANSLATIONS "" OFF) option(BUILD_SHARED_LIBS "" OFF) option(CHATTERINO_LTO "Enable LTO for all targets" OFF) -option(CHATTERINO_PLUGINS "Enable ALPHA plugin support in Chatterino" OFF) +option(CHATTERINO_PLUGINS "Enable ALPHA plugin support in Chatterino" ON) option(CHATTERINO_USE_GDI_FONTENGINE "Use the legacy GDI fontengine instead of the new DirectWrite one on Windows (Qt 6.8.0 and later)" ON) option(CHATTERINO_UPDATER "Enable update checks" ON)