From 0a4bef728e6740cb0c7bd885331c2cd93ba91dba Mon Sep 17 00:00:00 2001
From: DevilXD <4180725+DevilXD@users.noreply.github.com>
Date: Sat, 20 Jan 2024 11:09:06 +0100
Subject: [PATCH] Switch back to ubuntu-20.04 runners, fix AppImage builder
 exec

---
 .github/workflows/ci.yml     | 6 +++---
 appimage/AppImageBuilder.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c47ce4..664d72e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
 
   linux-pyinstaller:
     name: Linux (PyInstaller)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code
@@ -156,7 +156,7 @@ jobs:
 
   linux-appimage:
     name: Linux (AppImage)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code
@@ -191,7 +191,7 @@ jobs:
       - name: Create AppImage
         env:
           APPIMAGE_EXTRACT_AND_RUN: 1
-          APP_VERSION: ${{ steps.vars.outputs.app_version }}.${{ steps.vars.outputs.sha_short }}
+          APP_VERSION: ${{steps.vars.outputs.app_version}}.${{steps.vars.outputs.sha_short}}
         run: |
           ./appimage-builder --recipe appimage/AppImageBuilder.yml
 
diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml
index 417e05b..16a9c7a 100644
--- a/appimage/AppImageBuilder.yml
+++ b/appimage/AppImageBuilder.yml
@@ -22,7 +22,7 @@ script:
   - cp -r "$SOURCE_DIR/../lang" "$SOURCE_DIR/../pickaxe.ico" "$SOURCE_DIR"/../*.py "$TARGET_APPDIR/usr/src"
   - cp "$SOURCE_DIR/pickaxe.png" "$TARGET_APPDIR/usr/share/icons/hicolor/128x128/apps/io.github.devilxd.twitchdropsminer.png"
 
-  # Remove certifi from the line below if using Python 3.10+.
+  # Install requirements.
   - python3 -m pip install --ignore-installed --prefix=/usr --root="$TARGET_APPDIR" -r "$SOURCE_DIR/../requirements.txt"
 
 AppDir:
@@ -31,7 +31,7 @@ AppDir:
     name: Twitch Drops Miner
     icon: io.github.devilxd.twitchdropsminer
     version: '{{APP_VERSION}}'
-    exec: usr/bin/python3
+    exec: usr/bin/python${{env.PYTHON_VERSION}}
     exec_args: '${APPDIR}/usr/src/main.py $@'
 
   apt: