diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da0f4fcb..0420b288 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -344,46 +344,14 @@ jobs: steps: - uses: actions/checkout@v3 - # - name: Restore cache - snapcraft - # uses: actions/cache@v3 - # with: - # path: ~/snapcraft-cache - # key: snapcraft-cache-1 - - name: Install dependencies run: | sudo lxd init --auto sudo snap install snapcraft --classic - - name: measure disk space - run: | - sudo ls -l /var/snap - sudo ls -l /var/snap/lxd - for D in $(ls /var/snap); do sudo du -sh --apparent-size /var/snap/$D; done - - # - name: Move cache from home - # run: | - # if [[ -d "~/snapcraft-cache" ]]; then - # sudo rm -r /var/lib/snapd/cache - # sudo mv ~/snapcraft-cache /var/lib/snapd/cache - # sudo chown -R root:root /var/lib/snapd/cache - # echo "moved cache from home to root" - # fi - - name: Build snap run: sudo snapcraft --use-lxd - - name: measure disk space - run: | - sudo ls -l /var/snap - sudo ls -l /var/snap/lxd - for D in $(ls /var/snap); do sudo du -sh --apparent-size /var/snap/$D; done - - # - name: Move cache to home - # run: | - # sudo mv /var/lib/snapd/cache ~/snapcraft-cache - # sudo chown -R $USER:$USER ~/snapcraft-cache - - uses: actions/upload-artifact@v3 with: name: snapcraft-build diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8edcee12..b515b4ce 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -54,6 +54,7 @@ parts: export PYTHONPATH=\$SNAP/lib/python3.8/site-packages:\$SNAP/usr/lib/python3/dist-packages export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$SNAP/usr/local/lib ORIG_IFS=\$IFS + IFS=":" LIB_BASE=\$(for D in \$LD_LIBRARY_PATH; do echo \$D; done | grep \$SNAP/usr/lib/) IFS=\$ORIGIN_IFS export QT_PLUGIN_PATH=\$LIB_BASE/qt5/plugins