[neon/snap-packaging/gwenview-snap/Neon/master] debian: refine

[Carlos De Maine]

Git commit c0f33910446a1463f45e7248b8c6dbe6c1fab521 by Carlos De Maine.
Committed on 11/11/2024 at 05:43.
Pushed by carlosdem into branch 'Neon/master'.

refine

M  +5    -5    debian/snap-base-proto.yml
M  +6    -1    debian/snap-snapcraft-lxd-proto.yml

https://invent.kde.org/neon/snap-packaging/gwenview-snap/-/commit/c0f33910446a1463f45e7248b8c6dbe6c1fab521

diff --git a/debian/snap-base-proto.yml b/debian/snap-base-proto.yml
index 477eccf..d478eb4 100644
--- a/debian/snap-base-proto.yml
+++ b/debian/snap-base-proto.yml
@@ -42,19 +42,19 @@
     # upload to the snap store with the channel dependent on which branch we are building
     # master = edge
     if [ $CI_COMMIT_BRANCH == "master" ]; then
-        snapcraft push --release=edge *.snap
+        KDE_SNAP_CHANNEL: "edge"
     # RC branch = beta
     elif [ $CI_COMMIT_BRANCH == "Neon/release-24.12" ]; then
-        snapcraft push --release=beta *.snap
+        KDE_SNAP_CHANNEL: "beta"
     # Branch tags = candidate
     elif [ $CI_COMMIT_BRANCH == "Neon/release-24.08" ]; then
-    - snapcraft push --release=candidate *.snap
+        KDE_SNAP_CHANNEL: "candidate"
     # new release tag (new tarball release) = stable needs to be set off manually until ephemeral vm's are a thing
     #elif [ $CI_COMMIT_TAG == "v24.08.3" ]; then
     elif [ $SNAP_PUBLISH_TYPE" == "manual" ]; then
-    - snapcraft push --release=stable *.snap
+        KDE_SNAP_CHANNEL: "stable"
     else
-        exit
+        echo "this is not a publishable branch"
     fi
 artifacts:
     name: Snap artifacts
diff --git a/debian/snap-snapcraft-lxd-proto.yml b/debian/snap-snapcraft-lxd-proto.yml
index 89cfd62..d446315 100644
--- a/debian/snap-snapcraft-lxd-proto.yml
+++ b/debian/snap-snapcraft-lxd-proto.yml
@@ -1,5 +1,5 @@
 include:
-  - /gitlab-templates/blocks/snap-base.yml
+  #- /gitlab-templates/blocks/snap-base.yml
   - /gitlab-templates/blocks/workflow.yml
 
 snap_snapcraft_lxd:
@@ -72,3 +72,8 @@ snap_snapcraft_deploy:
   needs: snap_snapcraft_lxd
   inherit:
     default: true
+  script:
+    - snapcraft push --release=$KDE_SNAP_CHANNEL *.snap
+  allow_failure: true
+  interruptible: true
+