From 2e0285760d95effe456785d1a406b98d8708ae6f Mon Sep 17 00:00:00 2001
From: Dummerle <44114474+Dummerle@users.noreply.github.com>
Date: Tue, 7 Dec 2021 23:07:30 +0100
Subject: [PATCH] Fix appimage workflow

---
 .github/workflows/tests.yml | 16 ++--------------
 AppImageBuilder.yml         | 12 ++++++++----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 644de167..3b6dc82c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,14 +1,4 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
+
 name: "Test"
 
 on:
@@ -37,9 +27,7 @@ jobs:
           pip install -r requirements.txt
       - name: Install legendary
         run: |
-          pushd legendary
-          python setup.py install
-          popd
+          pip install ./rare/legendary
       - name: Analysing the code with pylint
         run: |
           pylint -E rare --disable=E0611,E1123,E1120 --ignore=ui,singleton.py --extension-pkg-whitelist=PyQt5
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
index f7555b86..2a086e4a 100644
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@@ -12,8 +12,8 @@ script:
   - cp AppDir/usr/src/rare/__main__.py AppDir/usr/src/__main__.py
   - cp AppDir/usr/src/rare/resources/images/Rare.png AppDir/usr/share/icons/hicolor/256x256/apps/
   # Install application dependencies
-  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir -r Rare/requirements.txt
-  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./Rare/legendary
+  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir pypresence qtawesome
+  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./Rare/rare/legendary
 
 AppDir:
   path: AppDir
@@ -21,7 +21,7 @@ AppDir:
     id: org.dummerle.rare
     name: Rare
     icon: Rare
-    version: 1.5.0
+    version: 1.7.0
     exec: usr/bin/python3
     exec_args: $APPDIR/usr/src/__main__.py $@
   apt:
@@ -44,6 +44,9 @@ AppDir:
       - python3-pkg-resources
       - python3-distutils
       - python3-pyqt5
+      - python3-pyqt5
+      - python3-psutil
+      - python3-requests
 
   runtime:
     env:
@@ -80,6 +83,7 @@ AppDir:
       image: appimagecrafters/tests-env:ubuntu-xenial
       command: ./AppRun
       use_host_x: true
+
 AppImage:
   arch: x86_64
-  update-information: gh-releases-zsync|Dummerle|Rare|latest|Rare-*x86_64.AppImage.zsync
+  update-information: gh-releases-zsync|Dummerle|Rare|latest|Rare*.AppImage.zsync