diff --git a/.CI/CreateUbuntuDeb.sh b/.CI/CreateUbuntuDeb.sh index 089e0a2aa..b2e6293d6 100755 --- a/.CI/CreateUbuntuDeb.sh +++ b/.CI/CreateUbuntuDeb.sh @@ -28,6 +28,10 @@ case "$ubuntu_release" in # Qt6 static-linked deb, see https://github.com/Chatterino/docker dependencies="libc6, libstdc++6, libglx0, libopengl0, libpng16-16, libharfbuzz0b, libfreetype6, libfontconfig1, libjpeg-turbo8, libxcb-glx0, libegl1, libx11-6, libxkbcommon0, libx11-xcb1, libxkbcommon-x11-0, libxcb-cursor0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render-util0, libxcb-shm0, libxcb-sync1, libxcb-xfixes0, libxcb-render0, libxcb-shape0, libxcb-xkb1, libxcb1, libbrotli1, libglib2.0-0, zlib1g, libicu74, libpcre2-16-0, libssl3, libgraphite2-3, libexpat1, libuuid1, libxcb-util1, libxau6, libxdmcp6, libffi8, libmount1, libnotify4, libselinux1, libpcre3, libbsd0, libblkid1, libpcre2-8-0, libmd0" ;; + 26.04) + # Qt6 static-linked deb, see https://github.com/Chatterino/docker + dependencies="libc6, libstdc++6, libglx0, libopengl0, libpng16-16, libharfbuzz0b, libfreetype6, libfontconfig1, libjpeg-turbo8, libxcb-glx0, libegl1, libx11-6, libxkbcommon0, libx11-xcb1, libxkbcommon-x11-0, libxcb-cursor0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render-util0, libxcb-shm0, libxcb-sync1, libxcb-xfixes0, libxcb-render0, libxcb-shape0, libxcb-xkb1, libxcb1, libbrotli1, libglib2.0-0, zlib1g, libicu78, libpcre2-16-0, libssl3, libgraphite2-3, libexpat1, libuuid1, libxcb-util1, libxau6, libxdmcp6, libffi8, libmount1, libnotify4, libselinux1, libbsd0, libblkid1, libpcre2-dev, libmd0" + ;; *) echo "Unsupported Ubuntu release $ubuntu_release" exit 1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00c1d3ffe..af3135e1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,6 @@ jobs: include: - os: ubuntu-22.04 container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest - qt-version: 6.7.2 force-lto: false skip-artifact: false skip-crashpad: false @@ -53,7 +52,6 @@ jobs: 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 @@ -61,12 +59,18 @@ jobs: 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 + - os: ubuntu-26.04 + container: ghcr.io/chatterino/chatterino2-build-ubuntu-26.04:latest + force-lto: false + skip-artifact: false + skip-crashpad: false + build-deb: true + plugins: true env: C2_ENABLE_LTO: ${{ matrix.force-lto }} C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }} @@ -133,7 +137,7 @@ jobs: if: matrix.build-deb uses: actions/upload-artifact@v7 with: - name: Chatterino-${{ matrix.os }}-Qt-${{ matrix.qt-version }}.deb + name: Chatterino-${{ matrix.os }}.deb path: build/Chatterino-${{ matrix.os }}-x86_64.deb build: @@ -144,13 +148,13 @@ jobs: include: # macOS - os: macos-14 - qt-version: 6.7.1 + qt-version: 6.11.1 force-lto: false skip-artifact: false skip-crashpad: false # Windows - os: windows-latest - qt-version: 6.7.1 + qt-version: 6.8.3 force-lto: false skip-artifact: false skip-crashpad: false diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index 5556482b3..13d360a7f 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -14,7 +14,7 @@ concurrency: jobs: check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 81af1e6ba..4d8c7fa8d 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -16,9 +16,9 @@ jobs: strategy: matrix: include: - # Ubuntu 22.04, Qt 6.6 - - os: ubuntu-22.04 - qt-version: 6.6.2 + # Ubuntu 24.04, Qt 6.11.1 + - os: ubuntu-24.04 + qt-version: 6.11.1 fail-fast: false diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml index f1c74e341..11b0dea98 100644 --- a/.github/workflows/create-installer.yml +++ b/.github/workflows/create-installer.yml @@ -18,7 +18,7 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} strategy: matrix: - qt-version: ["6.7.1"] + qt-version: ["6.11.1"] steps: - uses: actions/checkout@v6 with: diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 70dee6b24..f5523183b 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [macos-14] - qt-version: [6.7.1, 6.10.1] + qt-version: [6.8.3, 6.11.1] fail-fast: false env: QT_MODULES: qtimageformats diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 8e2defc0d..b7e8cb904 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [windows-latest] - qt-version: [6.7.1] + qt-version: [6.8.3] skip-artifact: [false] skip-crashpad: [false] fail-fast: false