From 3151dc4993204f0c1bf4fb5962d7d5ff09ae990f Mon Sep 17 00:00:00 2001 From: Rebecca Breu Date: Thu, 25 Apr 2024 19:12:41 +0200 Subject: [PATCH] Fix github appimage build --- .github/workflows/build_appimage.yml | 7 +++---- CONTRIBUTING.rst | 4 ++-- tools/build_appimage.py | 4 +++- tools/linux_libs.json | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_appimage.yml b/.github/workflows/build_appimage.yml index d550be6..dfc17ba 100644 --- a/.github/workflows/build_appimage.yml +++ b/.github/workflows/build_appimage.yml @@ -8,19 +8,18 @@ jobs: name: build_appimage runs-on: 'ubuntu-20.04' - strategy: steps: - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 - name: Build appimage run: | - bash tools/build_appimage --version=${{ github.ref_name }} --jsonfile=tools/linux_libs.json + python3 tools/build_appimage.py --version=${{ github.ref_name }} --jsonfile=tools/linux_libs.json - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: BeeRef*.appimage retention-days: 5 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2505eb7..310a5b0 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -7,12 +7,12 @@ BeeRef is written in Python and PyQt6. Developing ---------- -Optional step: Use pyenv to create a virtual environment: +Optional step: Use pyenv to create a virtual environment:: pyenv install -v 3.11 pyenv virtualenv 3.11 beeref -Once the vitrual environment is set up, you can enter it with: +Once the vitrual environment is set up, you can enter it with:: pyenv activate beeref diff --git a/tools/build_appimage.py b/tools/build_appimage.py index 68f6cc1..b4ac0f1 100755 --- a/tools/build_appimage.py +++ b/tools/build_appimage.py @@ -49,7 +49,9 @@ BEEVERSION = args.version.removeprefix('v') -APPIMAGE = 'python3.11.8-cp311-cp311-manylinux_2_28_x86_64.AppImage' +APPIMAGE = 'python3.11.9-cp311-cp311-manylinux2014_x86_64.AppImage' +# ^ Siehe: +# https://python-appimage.readthedocs.io/en/latest/#alternative-site-packages-location PYVER = '3.11' logger = logging.getLogger(__name__) logging.basicConfig(level=getattr(logging, args.loglevel)) diff --git a/tools/linux_libs.json b/tools/linux_libs.json index 492a5df..2169295 100644 --- a/tools/linux_libs.json +++ b/tools/linux_libs.json @@ -138,7 +138,7 @@ "libfribidi0", "libgcc-s1", "libgcrypt20", - "libgdk-pixbuf-2.0-0", + "libgdk-pixbuf2.0-0", "libglib2.0-0", "libglvnd0", "libglx0",