From 67eb7d09661b6b04bc4d7f480e48ef7cbf14f3a4 Mon Sep 17 00:00:00 2001 From: guihkx <626206+guihkx@users.noreply.github.com> Date: Sat, 26 Jul 2025 15:52:12 -0300 Subject: [PATCH] linux/appimage: remove x86_64 hardcoding from build recipe Now the target CPU architecture should be set by the 'ARCH' environment variable before invoking appimage-builder. This makes it easier to build the AppImage for other CPU architectures. --- .github/workflows/ci.yml | 1 + appimage/AppImageBuilder.yml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 629d960..d938944 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -207,6 +207,7 @@ jobs: - name: Create AppImage env: + ARCH: x86_64 APP_VERSION: ${{steps.vars.outputs.app_version}}.${{steps.vars.outputs.sha_short}} PYTHON_VERSION: ${{env.PYTHON_VERSION}} run: | diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml index 66949b7..dac09ab 100644 --- a/appimage/AppImageBuilder.yml +++ b/appimage/AppImageBuilder.yml @@ -131,14 +131,14 @@ AppDir: PATH: '${APPDIR}/usr/bin:${PATH}' PYTHONHOME: '${APPDIR}/usr' PYTHONPATH: '${APPDIR}/usr/lib/python3.10/tkinter:${APPDIR}/usr/lib/python3.10/site-packages' - APPDIR_LIBRARY_PATH: '${APPDIR}/usr/lib:${APPDIR}/usr/lib/x86_64-linux-gnu:${APPDIR}/lib/x86_64-linux-gnu' + APPDIR_LIBRARY_PATH: '${APPDIR}/usr/lib:${APPDIR}/usr/lib/{{ARCH}}-linux-gnu:${APPDIR}/lib/{{ARCH}}-linux-gnu' TCL_LIBRARY: '${APPDIR}/usr/share/tcltk/tcl8.6' - TK_LIBRARY: '${APPDIR}/usr/lib/tcltk/x86_64-linux-gnu/tk8.6' - TKPATH: '${APPDIR}/usr/lib/tcltk/x86_64-linux-gnu/tk8.6' + TK_LIBRARY: '${APPDIR}/usr/lib/tcltk/{{ARCH}}-linux-gnu/tk8.6' + TKPATH: '${APPDIR}/usr/lib/tcltk/{{ARCH}}-linux-gnu/tk8.6' AppImage: - arch: x86_64 - file_name: Twitch.Drops.Miner-x86_64.AppImage + arch: '{{ARCH}}' + file_name: Twitch.Drops.Miner-{{ARCH}}.AppImage comp: zstd sign-key: None update-information: guess