From ab8e0751b19465476a8465aa607acf5f3cafd118 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 7 Dec 2025 13:58:04 +0100 Subject: [PATCH] ci: drop Ubuntu 20.04 support (#6630) --- .CI/CreateUbuntuDeb.sh | 4 ---- .CI/full-ubuntu-build.sh | 6 ------ .github/workflows/build.yml | 13 ------------- BUILDING_ON_LINUX.md | 4 ++-- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.CI/CreateUbuntuDeb.sh b/.CI/CreateUbuntuDeb.sh index 39e01563..089e0a2a 100755 --- a/.CI/CreateUbuntuDeb.sh +++ b/.CI/CreateUbuntuDeb.sh @@ -20,10 +20,6 @@ deb_path="Chatterino-ubuntu-${ubuntu_release}-x86_64.deb" # Refactor opportunity: case "$ubuntu_release" in - 20.04) - # Qt6 static-linked deb, see https://github.com/Chatterino/docker - dependencies="libc6, libstdc++6, libblkid1, libbsd0, libexpat1, libffi7, libfontconfig1, libfreetype6, libglib2.0-0, libglvnd0, libglx0, libgraphite2-3, libharfbuzz0b, libicu66, libjpeg-turbo8, libmount1, libnotify4, libopengl0, libpcre2-16-0, libpcre3, libpng16-16, libselinux1, libssl1.1, libuuid1, libx11-xcb1, libxau6, libxcb1, libxcb-cursor0, libxcb-glx0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render0, libxcb-render-util0, libxcb-shape0, libxcb-shm0, libxcb-sync1, libxcb-util1, libxcb-xfixes0, libxcb-xkb1, libxdmcp6, libxkbcommon0, libxkbcommon-x11-0, zlib1g" - ;; 22.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, libicu70, libpcre2-16-0, libssl3, libgraphite2-3, libexpat1, libuuid1, libxcb-util1, libxau6, libxdmcp6, libffi8, libmount1, libnotify4, libselinux1, libpcre3, libbsd0, libblkid1, libpcre2-8-0, libmd0" diff --git a/.CI/full-ubuntu-build.sh b/.CI/full-ubuntu-build.sh index 8a0f46ff..246b56b4 100755 --- a/.CI/full-ubuntu-build.sh +++ b/.CI/full-ubuntu-build.sh @@ -10,12 +10,6 @@ env BUILD_TESTS="On" BUILD_BENCHMARKS="ON" -ubuntu_version="$(lsb_release -sr)" -if [ "$ubuntu_version" = "20.04" ]; then - BUILD_TESTS="Off" - BUILD_BENCHMARKS="Off" -fi - rm -rf build mkdir build cmake \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb710e4c..e002a870 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,13 +32,6 @@ jobs: strategy: matrix: include: - - os: ubuntu-20.04 - container: ghcr.io/chatterino/chatterino2-build-ubuntu-20.04:latest - qt-version: 6.7.2 - force-lto: false - skip-artifact: false - skip-crashpad: false - build-deb: true - os: ubuntu-22.04 container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest qt-version: 6.7.2 @@ -333,12 +326,6 @@ jobs: path: release-artifacts/ # Linux - - uses: actions/download-artifact@v6 - name: Ubuntu 20.04 deb - with: - name: Chatterino-ubuntu-20.04-Qt-6.7.2.deb - path: release-artifacts/ - - uses: actions/download-artifact@v6 name: Ubuntu 22.04 deb with: diff --git a/BUILDING_ON_LINUX.md b/BUILDING_ON_LINUX.md index cfaa5355..ba607786 100644 --- a/BUILDING_ON_LINUX.md +++ b/BUILDING_ON_LINUX.md @@ -8,10 +8,10 @@ For all dependencies below we use Qt 6. Our minimum supported version is Qt 5.15 Building on Ubuntu requires Docker. -Use as your base if you're on Ubuntu 20.04. - Use if you're on Ubuntu 22.04. +Use if you're on Ubuntu 24.04. + The built binary should be exportable from the final image & able to run on your system assuming you perform a static build. See our [build.yml GitHub workflow file](.github/workflows/build.yml) for the CMake line used for Ubuntu builds. ### Debian 13 (trixie) or later