From a261ca623018a7fe44ebbbf4420084ea2bc26d4c Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 5 Jun 2021 17:44:52 +0300 Subject: [PATCH] move snap build to core20 --- QIFData/installerCQtDeployer.pri | 9 +++------ snap/snapcraft.yaml | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/QIFData/installerCQtDeployer.pri b/QIFData/installerCQtDeployer.pri index 94540d1..5532eff 100644 --- a/QIFData/installerCQtDeployer.pri +++ b/QIFData/installerCQtDeployer.pri @@ -66,11 +66,9 @@ message( ONLINE_REPO_DIR $$ONLINE_REPO_DIR) $$PWD/../Distro/$$OUT_FILE } -buildSnap.commands = snapcraft -clearSnap.commands = rm parts prime stage *.snap -rdf -clearSnap2.commands = rm parts prime stage -rdf - -deploySnap.commands = rm *.snap -rdf && chmod 777 -R $$PWD/../prime && snapcraft && cp *.snap $$PWD/../Distro/ +buildSnap.commands = snapcraft --use-lxd +cleanSnap.commands = snapcraft clean --use-lxd +deploySnap.commands = cp *.snap $$PWD/../Distro/ releaseSnap.commands = snapcraft push *.snap # bad patern @@ -81,7 +79,6 @@ releaseSnap.commands = snapcraft push *.snap # bad patern unix:deploy.depends += clearSnap unix:deploy.depends += buildSnap unix:deploy.depends += deploySnap - unix:deploy.depends += clearSnap2 unix:release.depends += releaseSnap } diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index bf0126d..c0ebc23 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,7 +16,7 @@ description: | grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots -base: core18 +base: core20 icon: snap/gui/icon.png apps: cqtdeployer: