diff --git a/packaging/linux/snap/build.sh b/packaging/linux/snap/build.sh index 4c0ff92e32..4e810dde77 100755 --- a/packaging/linux/snap/build.sh +++ b/packaging/linux/snap/build.sh @@ -1,21 +1,21 @@ #!/bin/bash set -ex IMAGE=ubuntu:18.04 CONTAINER=container-krita-snap function at_exit { lxc stop $CONTAINER } lxc stop $CONTAINER || true lxc launch --ephemeral "$IMAGE" $CONTAINER sleep 4 # so network is up trap at_exit INT TERM EXIT -lxc file push --recursive . $CONTAINER/workspace -lxc exec $CONTAINER -- /workspace/build_in_container.sh -lxc file pull --recursive $CONTAINER/workspace/result . +lxc file push -p --recursive . $CONTAINER/workspace +lxc exec $CONTAINER -- /workspace/snap/build_in_container.sh +lxc file pull --recursive $CONTAINER/workspace/snap/result . diff --git a/packaging/linux/snap/build_in_container.sh b/packaging/linux/snap/build_in_container.sh index eb99551dda..a9b05c38bd 100755 --- a/packaging/linux/snap/build_in_container.sh +++ b/packaging/linux/snap/build_in_container.sh @@ -1,19 +1,19 @@ #!/bin/bash set -ex -cd /workspace +cd /workspace/snap ping -c1 networkcheck.kde.org apt-key adv --keyserver keyserver.ubuntu.com --recv E6D4736255751E5D echo 'deb http://archive.neon.kde.org/unstable bionic main' > /etc/apt/sources.list.d/neon.list apt update snap install --edge --classic snapcraft snapcraft --version snapcraft --destructive-mode mkdir -p result mv *.snap result/