Mercurial > minori

changeset 362:433eeaca3baf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CI/linux: revert change to linuxdeployqt; add qt plugin turns out I'm stupid and linuxdeployqt is insanely broken
author Paper <paper@paper.us.eu.org>
date Mon, 15 Jul 2024 01:28:57 -0400
parents d1d772665a07
children f10507d8f686
files .builds/linux.yml
diffstat 1 files changed, 8 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/.builds/linux.yml	Mon Jul 15 01:14:13 2024 -0400
+++ b/.builds/linux.yml	Mon Jul 15 01:28:57 2024 -0400
@@ -13,46 +13,28 @@
   - libwayland-dev
   - pkg-config
   - libglib2.0-dev
-  - desktop-file-utils
+sources:
+  - hg+https://hg.paper.us.eu.org/minori
 tasks:
   - build: |
       # build
       cd minori
       mkdir build
       cd build
-      cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+      cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
       make
-      make DESTDIR=AppDir install
 
       # resources
       mkdir -p rc
       cp ../rc/sys/linux/Minori.desktop rc/Minori.desktop
       cp ../rc/sys/linux/Minori.svg rc/Minori.svg
 
-      # use linuxdeployqt to make an appimage
-      wget -O linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-      chmod +x linuxdeployqt
-
-      mkdir -p AppDir/usr/bin
-      mkdir -p AppDir/usr/lib
-      mkdir -p AppDir/usr/share/applications
-      mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps
-
-      cp ../rc/sys/linux/Minori.svg AppDir/Minori.svg
-      cp ../rc/sys/linux/Minori.desktop AppDir/usr/share/applications/Minori.desktop
-      cp minori AppDir/usr/bin/minori
-
-      # hack: need to ignore linuxdeployqt silently failing due to missing appimagetool.
-      #       additionally, because of that we have to roll appimagetool ourselves
-      ./linuxdeployqt AppDir/usr/share/applications/Minori.desktop -unsupported-allow-new-glibc -appimage || true
-
-      # ack
-      wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-      chmod +x appimagetool
-
-      ./appimagetool AppDir minori-x86_64.AppImage
+      # use linuxdeploy to make an appimage
+      wget -O linuxdeploy "https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage"
+      chmod +x linuxdeploy
+      LD_LIBRARY_PATH=. ./linuxdeploy --appdir Minori --executable ./minori -d rc/Minori.desktop -i rc/Minori.svg --output appimage --plugin qt
 artifacts:
-  - minori/build/minori-x86_64.AppImage
+  - minori/build/Minori-x86_64.AppImage
 triggers:
   - action: email
     condition: failure