From 4abf8c59f7a6c61b0e65ea261892b92dbaa4ccdd Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 5 Oct 2025 16:05:32 +0200 Subject: [PATCH] dev: disable AppImage builds (#6504) --- .CI/CreateAppImage.sh | 91 ------------------------------------- .CI/full-ubuntu-build.sh | 3 +- .github/workflows/build.yml | 22 --------- CHANGELOG.md | 1 + 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100755 .CI/CreateAppImage.sh diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh deleted file mode 100755 index 12995b33..00000000 --- a/.CI/CreateAppImage.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -set -e - -# Print all commands as they are run -set -x - -if [ ! -f ./bin/chatterino ] || [ ! -x ./bin/chatterino ]; then - echo "ERROR: No chatterino binary file found. This script must be run in the build folder, and chatterino must be built first." - exit 1 -fi - -if [ -n "$Qt5_DIR" ]; then - echo "Using Qt DIR from Qt5_DIR: $Qt5_DIR" - _QT_DIR="$Qt5_DIR" -elif [ -n "$Qt6_DIR" ]; then - echo "Using Qt DIR from Qt6_DIR: $Qt6_DIR" - _QT_DIR="$Qt6_DIR" -fi - -if [ -n "$_QT_DIR" ]; then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${_QT_DIR}/lib" - export PATH="${_QT_DIR}/bin:$PATH" -else - echo "No Qt environment variable set, assuming system-installed Qt" -fi - -script_path=$(readlink -f "$0") -script_dir=$(dirname "$script_path") -chatterino_dir=$(dirname "$script_dir") - - -echo "Running LDD on chatterino binary:" -ldd ./bin/chatterino -echo "" - -echo "Running make install in the appdir" -make INSTALL_ROOT=appdir -j"$(nproc)" install ; find appdir/ -echo "" - -cp "$chatterino_dir"/resources/icon.png ./appdir/chatterino.png - -linuxdeployqt_path="linuxdeployqt-x86_64.AppImage" -linuxdeployqt_url="https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" - -if [ ! -f "$linuxdeployqt_path" ]; then - echo "Downloading LinuxDeployQT from $linuxdeployqt_url to $linuxdeployqt_path" - curl --location --fail --silent "$linuxdeployqt_url" -o "$linuxdeployqt_path" - chmod a+x "$linuxdeployqt_path" -fi - -appimagetool_path="appimagetool-x86_64.AppImage" -appimagetool_url="https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" - -if [ ! -f "$appimagetool_path" ]; then - echo "Downloading AppImageTool from $appimagetool_url to $appimagetool_path" - curl --location --fail --silent "$appimagetool_url" -o "$appimagetool_path" - chmod a+x "$appimagetool_path" -fi - -# For some reason, the copyright file for libc was not found. We need to manually copy it from the host system -mkdir -p appdir/usr/share/doc/libc6/ -cp /usr/share/doc/libc6/copyright appdir/usr/share/doc/libc6/ - -echo "Run LinuxDeployQT" -./"$linuxdeployqt_path" \ - --appimage-extract-and-run \ - appdir/usr/share/applications/com.chatterino.chatterino.desktop \ - -no-translations \ - -bundle-non-qt-libs \ - -unsupported-allow-new-glibc - -rm -rf appdir/home -rm -f appdir/AppRun - -echo "Run AppImageTool" - -# shellcheck disable=SC2016 -echo '#!/bin/sh -here="$(dirname "$(readlink -f "${0}")")" -export QT_QPA_PLATFORM_PLUGIN_PATH="$here/usr/plugins" -cd "$here/usr" -exec "$here/usr/bin/chatterino" "$@"' > appdir/AppRun -chmod a+x appdir/AppRun - -./"$appimagetool_path" \ - --appimage-extract-and-run \ - appdir - -# TODO: Create appimage in a unique directory instead maybe idk? -rm -rf appdir diff --git a/.CI/full-ubuntu-build.sh b/.CI/full-ubuntu-build.sh index 755dd2cc..8a0f46ff 100755 --- a/.CI/full-ubuntu-build.sh +++ b/.CI/full-ubuntu-build.sh @@ -1,7 +1,7 @@ #!/bin/sh # TODO: Investigate if the -fno-sized-deallocation flag is still necessary -# TODO: Test appimage/deb creation +# TODO: Test deb creation set -e @@ -33,5 +33,4 @@ cmake \ . cmake --build build -# sh ./../.CI/CreateAppImage.sh # sh ./../.CI/CreateUbuntuDeb.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82a775bc..499e1449 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,6 @@ jobs: force-lto: false skip-artifact: false skip-crashpad: false - build-appimage: false build-deb: true - os: ubuntu-22.04 container: ghcr.io/chatterino/chatterino2-build-ubuntu-22.04:latest @@ -46,7 +45,6 @@ jobs: force-lto: false skip-artifact: false skip-crashpad: false - build-appimage: true build-deb: true - os: ubuntu-24.04 container: ghcr.io/chatterino/chatterino2-build-ubuntu-24.04:latest @@ -54,7 +52,6 @@ jobs: force-lto: false skip-artifact: false skip-crashpad: false - build-appimage: false build-deb: true env: C2_ENABLE_LTO: ${{ matrix.force-lto }} @@ -103,19 +100,6 @@ jobs: git add -N lib/twitch-eventsub-ws/include lib/twitch-eventsub-ws/src git --no-pager diff --exit-code lib/twitch-eventsub-ws/include lib/twitch-eventsub-ws/src - - name: Package - AppImage (Ubuntu) - if: matrix.build-appimage - run: | - cd build - sh ./../.CI/CreateAppImage.sh - - - name: Upload artifact - AppImage (Ubuntu) - if: matrix.build-appimage - uses: actions/upload-artifact@v4 - with: - name: Chatterino-x86_64-Qt-${{ matrix.qt-version }}.AppImage - path: build/Chatterino-x86_64.AppImage - - name: Package - .deb (Ubuntu) if: matrix.build-deb run: | @@ -349,12 +333,6 @@ jobs: path: release-artifacts/ # Linux - - uses: actions/download-artifact@v5 - name: Linux AppImage - with: - name: Chatterino-x86_64-Qt-6.7.2.AppImage - path: release-artifacts/ - - uses: actions/download-artifact@v5 name: Ubuntu 20.04 deb with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 17212abe..d8ae797e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Dev: Update release documentation. (#6498) - Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493) - Dev: Remove unused QTextCodec includes. (#6487) +- Dev: Stopped building AppImage in CI. (#6504) - Dev: Find Boost's CMake Config file instead of module file. (#6499) - Dev: Fix 32-bit compile in PluginRepl. (#6483) - Dev: Fix the WinGet release workflow. (#6497)