From 5232cb535e7c8a8caf9a3481590c4c2cdc63dd00 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 5 Dec 2020 14:31:28 +0100 Subject: [PATCH] [CI] Add missing dependencies to Ubuntu packaging step (#2251) --- .CI/CreateAppImage.sh | 9 +++++++++ .github/workflows/build.yml | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh index 6d5334441..4a3c6c842 100755 --- a/.CI/CreateAppImage.sh +++ b/.CI/CreateAppImage.sh @@ -16,8 +16,14 @@ chatterino_dir=$(dirname "$script_dir") qmake_path=$(command -v qmake) +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-6-x86_64.AppImage" @@ -31,6 +37,7 @@ if [ ! -f appimagetool-x86_64.AppImage ]; then wget -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" chmod a+x appimagetool-x86_64.AppImage fi +echo "Run LinuxDeployQT" ./"$linuxdeployqt_path" \ appdir/usr/share/applications/*.desktop \ -no-translations \ @@ -41,6 +48,8 @@ fi rm -rf appdir/home rm -f appdir/AppRun +echo "Run AppImageTool" + # shellcheck disable=SC2016 echo '#!/bin/sh here="$(dirname "$(readlink -f "${0}")")" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a26bee28..485ff3e51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,23 @@ jobs: # LINUX - name: Install dependencies (Ubuntu) if: startsWith(matrix.os, 'ubuntu') - run: sudo apt-get update && sudo apt-get -y install libssl-dev libboost-dev libboost-system-dev libboost-filesystem-dev libpulse-dev libxkbcommon-x11-0 libgstreamer-plugins-base1.0-0 build-essential libgl1-mesa-dev + run: | + sudo apt-get update + sudo apt-get -y install \ + libssl-dev \ + libboost-dev \ + libboost-system-dev \ + libboost-filesystem-dev \ + libpulse-dev \ + libxkbcommon-x11-0 \ + libgstreamer-plugins-base1.0-0 \ + build-essential \ + libgl1-mesa-dev \ + libxcb-icccm4 \ + libxcb-image0 \ + libxcb-keysyms1 \ + libxcb-render-util0 \ + libxcb-xinerama0 - name: Build (Ubuntu) if: startsWith(matrix.os, 'ubuntu')