chore: Enable plugins in builds by default (#6075)

This commit is contained in:
pajlada
2025-03-14 11:58:21 +01:00
committed by GitHub
parent fb375e149b
commit d2ed3bbae7
8 changed files with 2 additions and 31 deletions
-1
View File
@@ -27,7 +27,6 @@ cmake \
-DBUILD_BENCHMARKS="$BUILD_BENCHMARKS" \ -DBUILD_BENCHMARKS="$BUILD_BENCHMARKS" \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
-DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \
-DCHATTERINO_STATIC_QT_BUILD=On \ -DCHATTERINO_STATIC_QT_BUILD=On \
-DCMAKE_CXX_FLAGS="-fno-sized-deallocation" \ -DCMAKE_CXX_FLAGS="-fno-sized-deallocation" \
-10
View File
@@ -36,7 +36,6 @@ jobs:
container: ghcr.io/chatterino/chatterino2-build-ubuntu-20.04:latest container: ghcr.io/chatterino/chatterino2-build-ubuntu-20.04:latest
qt-version: 6.7.2 qt-version: 6.7.2
force-lto: false force-lto: false
plugins: true
skip-artifact: false skip-artifact: false
skip-crashpad: false skip-crashpad: false
build-appimage: false build-appimage: false
@@ -45,7 +44,6 @@ jobs:
container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest
qt-version: 6.7.2 qt-version: 6.7.2
force-lto: false force-lto: false
plugins: true
skip-artifact: false skip-artifact: false
skip-crashpad: false skip-crashpad: false
build-appimage: true build-appimage: true
@@ -54,14 +52,12 @@ jobs:
container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest
qt-version: 6.7.2 qt-version: 6.7.2
force-lto: false force-lto: false
plugins: true
skip-artifact: false skip-artifact: false
skip-crashpad: false skip-crashpad: false
build-appimage: false build-appimage: false
build-deb: true build-deb: true
env: env:
C2_ENABLE_LTO: ${{ matrix.force-lto }} C2_ENABLE_LTO: ${{ matrix.force-lto }}
C2_PLUGINS: ${{ matrix.plugins }}
C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }}
steps: steps:
@@ -95,7 +91,6 @@ jobs:
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
-DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \
-DCHATTERINO_STATIC_QT_BUILD=On \ -DCHATTERINO_STATIC_QT_BUILD=On \
-DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-24.04' && 'On' || 'Off'}} \ -DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-24.04' && 'On' || 'Off'}} \
@@ -144,21 +139,18 @@ jobs:
- os: macos-14 - os: macos-14
qt-version: 6.7.1 qt-version: 6.7.1
force-lto: false force-lto: false
plugins: true
skip-artifact: false skip-artifact: false
skip-crashpad: false skip-crashpad: false
# Windows # Windows
- os: windows-latest - os: windows-latest
qt-version: 6.7.1 qt-version: 6.7.1
force-lto: false force-lto: false
plugins: true
skip-artifact: false skip-artifact: false
skip-crashpad: false skip-crashpad: false
fail-fast: false fail-fast: false
env: env:
C2_ENABLE_LTO: ${{ matrix.force-lto }} C2_ENABLE_LTO: ${{ matrix.force-lto }}
C2_PLUGINS: ${{ matrix.plugins }}
C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }}
steps: steps:
@@ -239,7 +231,6 @@ jobs:
-DUSE_PRECOMPILED_HEADERS=ON ` -DUSE_PRECOMPILED_HEADERS=ON `
-DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" ` -DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" `
-DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" ` -DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" `
-DCHATTERINO_PLUGINS="$Env:C2_PLUGINS" `
-DFORCE_JSON_GENERATION=On ` -DFORCE_JSON_GENERATION=On `
.. ..
set cl=/MP set cl=/MP
@@ -308,7 +299,6 @@ jobs:
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
-DFORCE_JSON_GENERATION=Off \ -DFORCE_JSON_GENERATION=Off \
.. ..
make -j"$(sysctl -n hw.logicalcpu)" make -j"$(sysctl -n hw.logicalcpu)"
-1
View File
@@ -62,7 +62,6 @@ jobs:
-DBUILD_TESTS=On \ -DBUILD_TESTS=On \
-DBUILD_BENCHMARKS=On \ -DBUILD_BENCHMARKS=On \
-DBUILD_APP=OFF \ -DBUILD_APP=OFF \
-DCHATTERINO_PLUGINS=On \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
.. ..
working-directory: build-test working-directory: build-test
-7
View File
@@ -25,17 +25,11 @@ jobs:
matrix: matrix:
os: [macos-14] os: [macos-14]
qt-version: [6.4.3, 6.7.1] qt-version: [6.4.3, 6.7.1]
plugins: [true]
fail-fast: false fail-fast: false
env: env:
QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }}
steps: steps:
- name: Enable plugin support
if: matrix.plugins
run: |
echo "C2_PLUGINS=ON" >> "$GITHUB_ENV"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
@@ -69,7 +63,6 @@ jobs:
-DBUILD_TESTS=On \ -DBUILD_TESTS=On \
-DBUILD_APP=OFF \ -DBUILD_APP=OFF \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
.. ..
make -j"$(sysctl -n hw.logicalcpu)" make -j"$(sysctl -n hw.logicalcpu)"
-7
View File
@@ -24,7 +24,6 @@ jobs:
matrix: matrix:
os: [windows-latest] os: [windows-latest]
qt-version: [6.7.1] qt-version: [6.7.1]
plugins: [true]
skip-artifact: [false] skip-artifact: [false]
skip-crashpad: [false] skip-crashpad: [false]
fail-fast: false fail-fast: false
@@ -34,11 +33,6 @@ jobs:
C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }} C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }}
steps: steps:
- name: Enable plugin support
if: matrix.plugins
run: |
echo "C2_PLUGINS=ON" >> "$Env:GITHUB_ENV"
- name: Set Crashpad - name: Set Crashpad
if: matrix.skip-crashpad == false if: matrix.skip-crashpad == false
run: | run: |
@@ -121,7 +115,6 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" ` -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" `
-DUSE_PRECOMPILED_HEADERS=On ` -DUSE_PRECOMPILED_HEADERS=On `
-DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" ` -DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" `
-DCHATTERINO_PLUGINS="$Env:C2_PLUGINS" `
.. ..
set cl=/MP set cl=/MP
nmake /S /NOLOGO nmake /S /NOLOGO
-4
View File
@@ -30,10 +30,7 @@ jobs:
- os: "ubuntu-22.04" - os: "ubuntu-22.04"
container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest
qt-version: 6.7.1 qt-version: 6.7.1
plugins: true
fail-fast: false fail-fast: false
env:
C2_PLUGINS: ${{ matrix.plugins }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -62,7 +59,6 @@ jobs:
-DBUILD_TESTS=On \ -DBUILD_TESTS=On \
-DBUILD_BENCHMARKS=On \ -DBUILD_BENCHMARKS=On \
-DBUILD_APP=OFF \ -DBUILD_APP=OFF \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
-DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \ -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \
-DCHATTERINO_STATIC_QT_BUILD=On \ -DCHATTERINO_STATIC_QT_BUILD=On \
-DCHATTERINO_GENERATE_COVERAGE=On \ -DCHATTERINO_GENERATE_COVERAGE=On \
+1
View File
@@ -65,6 +65,7 @@
- Dev: Updated `qtkeychain` to 0.15.0. (#5871) - Dev: Updated `qtkeychain` to 0.15.0. (#5871)
- Dev: Updated `googletest` to 1.16.0. (#5942) - Dev: Updated `googletest` to 1.16.0. (#5942)
- Dev: Fixed duplicate CMake configure in clean builds. (#5940) - 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: 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: 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) - Dev: Build with Qt 6.4.3 in CI. (#6032)
+1 -1
View File
@@ -28,7 +28,7 @@ option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF)
option(BUILD_TRANSLATIONS "" OFF) option(BUILD_TRANSLATIONS "" OFF)
option(BUILD_SHARED_LIBS "" OFF) option(BUILD_SHARED_LIBS "" OFF)
option(CHATTERINO_LTO "Enable LTO for all targets" 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_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) option(CHATTERINO_UPDATER "Enable update checks" ON)