]> sigrok.org Git - sigrok-build.git/commitdiff
build.yml: Try pinning python version to 3.8 from ubuntu-20.04
authorSoeren Apel <redacted>
Sun, 25 Aug 2024 17:12:32 +0000 (19:12 +0200)
committerSoeren Apel <redacted>
Sun, 25 Aug 2024 17:15:59 +0000 (19:15 +0200)
.github/workflows/build.yml
ci/appimage/sigrok-appimage-create-appimage.sh

index a393af8fb567d31dbb71e061d5edd3cd6608816e..0f2b75a444febb9f162b4bb4163bed2415c3dc31 100644 (file)
@@ -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
index 649130142f4e2a2c2cb296afd9ee06d341317ab7..54f0c9635ce8ef6106914d8281590a91ae8fc7f1 100755 (executable)
@@ -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