From: Soeren Apel <redacted>
Date: Sun, 25 Aug 2024 17:12:32 +0000 (+0200)
Subject: build.yml: Try pinning python version to 3.8 from ubuntu-20.04
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0675b634880513e9b1c15e41754987ab87922def;p=sigrok-build.git

build.yml: Try pinning python version to 3.8 from ubuntu-20.04
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a393af8..0f2b75a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -240,7 +240,7 @@ jobs:
           sudo apt-get update
           sudo apt-get upgrade -y
           # Temp!
-          sudo apt-get install -y python3-dev
+          sudo apt-get install -y python3.8-dev
 
       - name: Checkout sigrok-build
         # Cannot use actions/checkout because it always checks out the calling actions' repo, not the one specified
@@ -340,7 +340,7 @@ jobs:
           # Temp!
           sudo apt-get install -y libffi-dev
           # Temp!
-          sudo apt-get install -y python3-dev
+          sudo apt-get install -y python3.8-dev
 
       - name: Checkout sigrok-build
         # Cannot use actions/checkout because it always checks out the calling actions' repo, not the one specified
diff --git a/ci/appimage/sigrok-appimage-create-appimage.sh b/ci/appimage/sigrok-appimage-create-appimage.sh
index 6491301..54f0c96 100755
--- a/ci/appimage/sigrok-appimage-create-appimage.sh
+++ b/ci/appimage/sigrok-appimage-create-appimage.sh
@@ -41,9 +41,7 @@ cp -r "$INSTALL_DIR"/share/sigrok-firmware "$APP_DIR"/usr/share
 
 # Copy extra Python files
 mkdir -p "$APP_DIR"/usr/share/pyshared
-# Find local python path of the latest version, e.g. /usr/lib/python3.12
-export LOCAL_PYTHON_PATH=`find /usr/lib -maxdepth 1 -iname "python3*" | sort -V | tail -n 1`
-cp -r $LOCAL_PYTHON_PATH/* "$APP_DIR"/usr/share/pyshared
+cp -r /usr/lib/python3.8/* "$APP_DIR"/usr/share/pyshared
 
 # AppImage build dir
 mkdir -p appimage-build