From 1ee37e026c48abf5256329359e3ce2e741a96ae8 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:02:46 +0600 Subject: [PATCH 01/13] Add AppImage build --- .gitlab-ci.yml | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 197cc7ac..39bf927b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -218,6 +218,73 @@ build-flatpak-arm64: paths: ['build-flatpak/nheko-arm64.flatpak'] name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-arm64 +appimage-amd64: + stage: build + image: ubuntu:22.04 + tags: [docker] + before_script: + # Installing the packages needed to download and install third-party tools + - apt-get update && apt-get install -y software-properties-common git wget curl + + # Installing the packages needed to compile nheko and third-party tools + - apt-get -y install --no-install-suggests --no-install-recommends ca-certificates build-essential ninja-build cmake gcc make automake ccache liblmdb-dev + libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev + qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools qtdeclarative5-dev + qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qt-labs-platform + qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev nlohmann-json3-dev libcmark-dev asciidoc libre2-dev libgtest-dev libgl1-mesa-dev python3 python3-pip python3-setuptools + + # Installing the packages needed to build AppImage + - apt-get -yq install breeze-icon-theme desktop-file-utils elfutils fakeroot file gnupg2 gtk-update-icon-cache libgdk-pixbuf2.0-dev libgdk-pixbuf2.0-0 libglib2.0-bin librsvg2-dev libyaml-dev strace zsync squashfs-tools + + - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool && \ + - chmod +x /usr/local/bin/appimagetool + + - python3 -m pip install --upgrade pip + - pip3 install appimage-builder + + - /usr/sbin/update-ccache-symlinks + - rm -rf ../.hunter && mv .hunter ../.hunter || true + + script: + - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}" + - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja + -DHUNTER_ROOT=".hunter" + -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF + -DVOIP=OFF + -DMAN=OFF + -DCI_BUILD=ON + -DHUNTER_CONFIGURATION_TYPES=Release + -DUSE_BUNDLED_SPDLOG=ON + -DUSE_BUNDLED_OLM=ON + -DUSE_BUNDLED_GTEST=OFF + -DUSE_BUNDLED_CMARK=ON + -DUSE_BUNDLED_JSON=ON + -DUSE_BUNDLED_OPENSSL=ON + -DUSE_BUNDLED_MTXCLIENT=ON + -DUSE_BUNDLED_LMDB=OFF + -DUSE_BUNDLED_LMDBXX=ON + -DUSE_BUNDLED_QTKEYCHAIN=OFF + -DUSE_BUNDLED_LIBEVENT=ON + -DUSE_BUNDLED_LIBCURL=ON + -DUSE_BUNDLED_COEURL=ON + -DJSON_ImplicitConversions=OFF + - DESTDIR=`pwd`/AppDir ninja -C build install/local + - DESTDIR=`pwd`/AppDir ninja -C build _deps/cmark-build/src/install + - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu + - appimage-builder --skip-test + after_script: + - bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage + artifacts: + paths: + - 'nheko-latest-x86_64.AppImage' + expire_in: 1 week + expose_as: 'appimage-amd64' + cache: + key: "$CI_JOB_NAME" + paths: + - .hunter/ + - .ccache + linting: stage: build image: alpine:latest From 1f666acffc4d2ce8ec169b399dcaa4e95a758344 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:08:01 +0600 Subject: [PATCH 02/13] Add AppImage recipe file --- AppImageBuilder.yml | 136 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 AppImageBuilder.yml diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml new file mode 100644 index 00000000..5b4ea481 --- /dev/null +++ b/AppImageBuilder.yml @@ -0,0 +1,136 @@ +# appimage-builder recipe see https://appimage-builder.readthedocs.io for details +version: 1 +AppDir: + path: ./AppDir + app_info: + id: nheko + name: nheko + icon: nheko + version: latest + exec: usr/bin/nheko + exec_args: $@ + runtime: + env: + APPDIR_LIBRARY_PATH: $APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/x86_64-linux-gnu/gconv:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio + apt: + arch: amd64 + allow_unauthenticated: true + sources: + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse + - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse + - sourceline: deb http://archive.canonical.com/ubuntu jammy partner + key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c + include: + # idk, need there ca-certificates, but some systems may not have + - ca-certificates + - gstreamer1.0-libav + - gstreamer1.0-plugins-bad + - gstreamer1.0-plugins-base + - gstreamer1.0-plugins-good + - gstreamer1.0-pulseaudio + - gstreamer1.0-x + - kimageformat-plugins + - libbs2b0 + - libbz2-1.0 + - libcurl4 + - libelf1 + - libexpat1 + - libevent-core-2.1-7 + - libevent-pthreads-2.1-7 + - libjpeg-turbo8 + - libkf5archive5 + - liblmdb0 + - liblz4-1 + - libnorm1 + - libnss-mdns + - libpcre3 + - libqt5keychain1 + - qml-module-qt-labs-platform + - qml-module-qt-labs-settings + - qml-module-qtgraphicaleffects + - qml-module-qtmultimedia + - qml-module-qtquick2 + - qml-module-qtquick-controls2 + - qml-module-qtquick-layouts + - qml-module-qtquick-window2 + - gstreamer1.0-nice + - gstreamer1.0-qt5 + - gstreamer1.0-vaapi + - libcmark0.30.2 + - libfmt8 + - libgcc-s1 + - libglib2.0-0 + - libgstreamer-plugins-bad1.0-0 + - libgstreamer-plugins-base1.0-0 + - libgstreamer1.0-0 + - libolm3 + - libqt5core5a + - libqt5dbus5 + - libqt5gui5 + - libqt5keychain1 + - libqt5multimedia5 + - libqt5multimedia5-plugins + - libqt5network5 + - libqt5qml5 + - libqt5quick5 + - libqt5quickwidgets5 + - libqt5svg5 + - libqt5widgets5 + - libspdlog1-fmt8 + - libxcb-ewmh2 + - libxcb1 + - librubberband2 + - libsm6 + - libsnappy1v5 + - libsystemd0 + - libwayland-server0 + - libxau6 + - libxcb-render-util0 + - libxcb-sync1 + - libxcb-xinerama0 + - libxcb-xkb1 + - libxcursor1 + - libxdmcp6 + - libxext6 + - libxfixes3 + - libxrender1 + - libxshmfence1 + - libxv1 + - libxxf86vm1 + - libzstd1 + exclude: [] + files: + exclude: + - usr/share/man + - usr/share/doc + - opt/qt515/examples + - opt/qt515/bin + - opt/qt515/include + - opt/qt515/mkspecs + test: + fedora: + image: appimagecrafters/tests-env:fedora-30 + command: ./AppRun + use_host_x: true + debian: + image: appimagecrafters/tests-env:debian-stable + command: ./AppRun + use_host_x: true + arch: + image: appimagecrafters/tests-env:archlinux-latest + command: ./AppRun + use_host_x: true + centos: + image: appimagecrafters/tests-env:centos-7 + command: ./AppRun + use_host_x: true + ubuntu: + image: appimagecrafters/tests-env:ubuntu-xenial + command: ./AppRun + use_host_x: true +AppImage: + arch: x86_64 + update-information: None + sign-key: None From 7747469825f3926c73389c7ccff087a5c3505b46 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Fri, 21 Oct 2022 09:43:21 +0600 Subject: [PATCH 03/13] Disable bundle some packages in AppImage --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39bf927b..7b42204b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,6 +222,7 @@ appimage-amd64: stage: build image: ubuntu:22.04 tags: [docker] + allow_failure: true before_script: # Installing the packages needed to download and install third-party tools - apt-get update && apt-get install -y software-properties-common git wget curl @@ -254,18 +255,18 @@ appimage-amd64: -DMAN=OFF -DCI_BUILD=ON -DHUNTER_CONFIGURATION_TYPES=Release - -DUSE_BUNDLED_SPDLOG=ON + -DUSE_BUNDLED_SPDLOG=OFF -DUSE_BUNDLED_OLM=ON -DUSE_BUNDLED_GTEST=OFF -DUSE_BUNDLED_CMARK=ON -DUSE_BUNDLED_JSON=ON - -DUSE_BUNDLED_OPENSSL=ON + -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_LMDBXX=ON -DUSE_BUNDLED_QTKEYCHAIN=OFF - -DUSE_BUNDLED_LIBEVENT=ON - -DUSE_BUNDLED_LIBCURL=ON + -DUSE_BUNDLED_LIBEVENT=OFF + -DUSE_BUNDLED_LIBCURL=OFF -DUSE_BUNDLED_COEURL=ON -DJSON_ImplicitConversions=OFF - DESTDIR=`pwd`/AppDir ninja -C build install/local From ef0ef4dbb2a8dd00e2ec50ff8ed0b1ba3513b366 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:34:21 +0600 Subject: [PATCH 04/13] AppImage: Use bundled OpenSSL --- .gitlab-ci.yml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b42204b..1beb43f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,27 +248,14 @@ appimage-amd64: script: - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}" - - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja - -DHUNTER_ROOT=".hunter" - -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF - -DVOIP=OFF - -DMAN=OFF - -DCI_BUILD=ON - -DHUNTER_CONFIGURATION_TYPES=Release - -DUSE_BUNDLED_SPDLOG=OFF - -DUSE_BUNDLED_OLM=ON - -DUSE_BUNDLED_GTEST=OFF - -DUSE_BUNDLED_CMARK=ON - -DUSE_BUNDLED_JSON=ON - -DUSE_BUNDLED_OPENSSL=OFF - -DUSE_BUNDLED_MTXCLIENT=ON - -DUSE_BUNDLED_LMDB=OFF - -DUSE_BUNDLED_LMDBXX=ON - -DUSE_BUNDLED_QTKEYCHAIN=OFF - -DUSE_BUNDLED_LIBEVENT=OFF - -DUSE_BUNDLED_LIBCURL=OFF - -DUSE_BUNDLED_COEURL=ON - -DJSON_ImplicitConversions=OFF + - cmake -GNinja -H. -Bbuild + -DCMAKE_INSTALL_PREFIX=/usr + -DHUNTER_ROOT=".hunter" + -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_QTKEYCHAIN=OFF + -DVOIP=OFF -DMAN=OFF + -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release + -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF + -DJSON_ImplicitConversions=OFF - DESTDIR=`pwd`/AppDir ninja -C build install/local - DESTDIR=`pwd`/AppDir ninja -C build _deps/cmark-build/src/install - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu @@ -298,4 +285,3 @@ linting: script: - make lint - make license - From 4636211b90ca7f8426b0a52059897f28e6c220f0 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:40:17 +0600 Subject: [PATCH 05/13] AppImage: use bundled libevent --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1beb43f5..2b9cc03b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,7 +251,7 @@ appimage-amd64: - cmake -GNinja -H. -Bbuild -DCMAKE_INSTALL_PREFIX=/usr -DHUNTER_ROOT=".hunter" - -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_QTKEYCHAIN=OFF + -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_QTKEYCHAIN=OFF -DUSE_BUNDLED_LIBEVENT=OFF -DVOIP=OFF -DMAN=OFF -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF From 7cd45c16fdf05b3c294774949c640b833362acad Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Sun, 23 Oct 2022 06:40:28 +0600 Subject: [PATCH 06/13] AppImage: trying to reduce final AppImage size --- AppImageBuilder.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index 5b4ea481..b4dddb62 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -26,9 +26,7 @@ AppDir: # idk, need there ca-certificates, but some systems may not have - ca-certificates - gstreamer1.0-libav - - gstreamer1.0-plugins-bad - gstreamer1.0-plugins-base - - gstreamer1.0-plugins-good - gstreamer1.0-pulseaudio - gstreamer1.0-x - kimageformat-plugins @@ -55,16 +53,8 @@ AppDir: - qml-module-qtquick-controls2 - qml-module-qtquick-layouts - qml-module-qtquick-window2 - - gstreamer1.0-nice - - gstreamer1.0-qt5 - - gstreamer1.0-vaapi - libcmark0.30.2 - libfmt8 - - libgcc-s1 - - libglib2.0-0 - - libgstreamer-plugins-bad1.0-0 - - libgstreamer-plugins-base1.0-0 - - libgstreamer1.0-0 - libolm3 - libqt5core5a - libqt5dbus5 @@ -84,8 +74,6 @@ AppDir: - librubberband2 - libsm6 - libsnappy1v5 - - libsystemd0 - - libwayland-server0 - libxau6 - libxcb-render-util0 - libxcb-sync1 From eb845b2290b2ed884f9ea9f6945d86b542b487e9 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:00:49 +0600 Subject: [PATCH 07/13] AppImage: reduce package size --- AppImageBuilder.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index b4dddb62..362ee351 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -25,11 +25,7 @@ AppDir: include: # idk, need there ca-certificates, but some systems may not have - ca-certificates - - gstreamer1.0-libav - - gstreamer1.0-plugins-base - - gstreamer1.0-pulseaudio - - gstreamer1.0-x - - kimageformat-plugins + - gstreamer1.0-plugins-good - libbs2b0 - libbz2-1.0 - libcurl4 @@ -44,7 +40,6 @@ AppDir: - libnorm1 - libnss-mdns - libpcre3 - - libqt5keychain1 - qml-module-qt-labs-platform - qml-module-qt-labs-settings - qml-module-qtgraphicaleffects @@ -63,8 +58,6 @@ AppDir: - libqt5multimedia5 - libqt5multimedia5-plugins - libqt5network5 - - libqt5qml5 - - libqt5quick5 - libqt5quickwidgets5 - libqt5svg5 - libqt5widgets5 @@ -93,10 +86,6 @@ AppDir: exclude: - usr/share/man - usr/share/doc - - opt/qt515/examples - - opt/qt515/bin - - opt/qt515/include - - opt/qt515/mkspecs test: fedora: image: appimagecrafters/tests-env:fedora-30 From 10e242609026c44c21d4e4b061a02d5aeb0dd0b7 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 5 Jan 2023 06:51:46 +0600 Subject: [PATCH 08/13] Fix appimage-builder package version query bug See: https://github.com/AppImageCrafters/appimage-builder/issues/280 --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14063f88..972a1af9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -245,8 +245,12 @@ appimage-amd64: - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool && \ - chmod +x /usr/local/bin/appimagetool - - python3 -m pip install --upgrade pip - - pip3 install appimage-builder + # Workaround for https://github.com/AppImageCrafters/appimage-builder/issues/280 + - cd /tmp + - git clone https://github.com/AppImageCrafters/appimage-builder + - git checkout 9733877eed75aea0fa8e9a1cd26c22d77a10aa4a + - pip3 install . + - pip3 install cffi - /usr/sbin/update-ccache-symlinks - rm -rf ../.hunter && mv .hunter ../.hunter || true From c91694c6b25356755b7c4918a3aa256432ea4915 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 5 Jan 2023 08:46:00 +0600 Subject: [PATCH 09/13] Fix stupid typo in AppImage --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 972a1af9..52fa2fa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -245,12 +245,16 @@ appimage-amd64: - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool && \ - chmod +x /usr/local/bin/appimagetool + - export HOME_DIR=$(pwd) + # Workaround for https://github.com/AppImageCrafters/appimage-builder/issues/280 - cd /tmp - git clone https://github.com/AppImageCrafters/appimage-builder + - cd appimage-builder - git checkout 9733877eed75aea0fa8e9a1cd26c22d77a10aa4a - pip3 install . - pip3 install cffi + - cd $HOME_DIR - /usr/sbin/update-ccache-symlinks - rm -rf ../.hunter && mv .hunter ../.hunter || true From a823dacfb5592d4e71545c7fedc7086b66af4ea2 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 5 Jan 2023 09:16:08 +0600 Subject: [PATCH 10/13] Try to fix blank screen in AppImage build --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52fa2fa5..9ee61bbd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,14 +230,14 @@ appimage-amd64: allow_failure: true before_script: # Installing the packages needed to download and install third-party tools - - apt-get update && apt-get install -y software-properties-common git wget curl + - apt-get update && apt-get install -y software-properties-common git wget curl python3 python3-pip python3-setuptools # Installing the packages needed to compile nheko and third-party tools - apt-get -y install --no-install-suggests --no-install-recommends ca-certificates build-essential ninja-build cmake gcc make automake ccache liblmdb-dev libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools qtdeclarative5-dev qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qt-labs-platform - qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev nlohmann-json3-dev libcmark-dev asciidoc libre2-dev libgtest-dev libgl1-mesa-dev python3 python3-pip python3-setuptools + qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev nlohmann-json3-dev libcmark-dev asciidoc libre2-dev libgtest-dev libgl1-mesa-dev qml-module-qtquick-particles2 # Installing the packages needed to build AppImage - apt-get -yq install breeze-icon-theme desktop-file-utils elfutils fakeroot file gnupg2 gtk-update-icon-cache libgdk-pixbuf2.0-dev libgdk-pixbuf2.0-0 libglib2.0-bin librsvg2-dev libyaml-dev strace zsync squashfs-tools From f7749d9f97cc7ab7a109c57ea2eaf239256d7413 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 5 Jan 2023 09:37:34 +0600 Subject: [PATCH 11/13] Try to fix blank screen in AppImage build --- AppImageBuilder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index 362ee351..9f964e3c 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -43,6 +43,7 @@ AppDir: - qml-module-qt-labs-platform - qml-module-qt-labs-settings - qml-module-qtgraphicaleffects + - qml-module-qtquick-particles2 - qml-module-qtmultimedia - qml-module-qtquick2 - qml-module-qtquick-controls2 From 5ba74a5d90fcac8bddcfd0e593dc5d730a870825 Mon Sep 17 00:00:00 2001 From: Zhymabek Roman <61125068+ZhymabekRoman@users.noreply.github.com> Date: Thu, 5 Jan 2023 09:43:51 +0600 Subject: [PATCH 12/13] Update AppImageBuilder.yml Co-authored-by: DeepBlueV7.X --- AppImageBuilder.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index 9f964e3c..3b7c5350 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -87,6 +87,14 @@ AppDir: exclude: - usr/share/man - usr/share/doc + - usr/bin/cmark + - usr/bin/dbus* + - usr/bin/openssl + - usr/bin/c_rehash + - usr/bin/session-migration + - usr/include + - usr/sbin + - lib/systemd test: fedora: image: appimagecrafters/tests-env:fedora-30 From 82376877afe74b9d73449cbc2127f3d827b5e140 Mon Sep 17 00:00:00 2001 From: "DeepBlueV7.X" Date: Thu, 5 Jan 2023 04:06:26 +0000 Subject: [PATCH 13/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ee61bbd..c1130420 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -275,6 +275,8 @@ appimage-amd64: - appimage-builder --skip-test after_script: - bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage + rules: + - if : '$CI_PIPELINE_TRIGGERED == null' artifacts: paths: - 'nheko-latest-x86_64.AppImage'