[neon/snap-packaging/gwenview-snap/Neon/release-24.12] debian: move the logic into the base_ .snap_deploy

[Carlos De Maine]

Git commit 09b00f5344301590f2a41db077c117ca579a4230 by Carlos De Maine.
Committed on 12/11/2024 at 01:03.
Pushed by carlosdem into branch 'Neon/release-24.12'.

move the logic into the base_ .snap_deploy

M  +23   -1    debian/snap-base-proto.yml
M  +0    -22   debian/snap-snapcraft-lxd-proto.yml

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

diff --git a/debian/snap-base-proto.yml b/debian/snap-base-proto.yml
index 8c6ce76..0c29af9 100644
--- a/debian/snap-base-proto.yml
+++ b/debian/snap-base-proto.yml
@@ -38,7 +38,29 @@
   variables:
     GIT_STRATEGY: none
   interruptible: true
-  #script:
+  script:
+  - echo "KDE_SNAP_BRANCH is $KDE_SNAP_BRANCH and KDE_SNAP_CHANNEL IS $KDE_SNAP_CHANNEL"
+    - ls -lsh
+    - cat build.env
+    - export KDE_SNAP_BRANCH=$(cat build.env)
+    - |
+      # set the channel for the snap dependent on which branch we are building
+      # master = edge
+      if [ "$KDE_SNAP_BRANCH" == "master" ]; then
+          export KDE_SNAP_CHANNEL="edge"
+      # RC branch = beta
+      elif [ "$KDE_SNAP_BRANCH" == "Neon/release-24.12" ]; then
+          export KDE_SNAP_CHANNEL="beta"
+      # Branch tags = candidate
+      elif [ "$KDE_SNAP_BRANCH" == "Neon/release-24.08" ]; then
+          export KDE_SNAP_CHANNEL="candidate"
+      # new release tag (new tarball release) = stable needs to be set off manually until ephemeral vms are a thing
+      #elif [ "$KDE_SNAP_BRANCH" == "v24.08.3" ]; then
+      elif [ "$SNAP_PUBLISH_TYPE" == "manual" ]; then
+          export KDE_SNAP_CHANNEL="stable"
+      else
+          echo "this is not a publishable branch"
+      fi
 #artifacts:
 #    name: Snap deploy artifacts
 #    expose_as: 'KDE neon snaps deploy'
diff --git a/debian/snap-snapcraft-lxd-proto.yml b/debian/snap-snapcraft-lxd-proto.yml
index 6f7e218..ad760f3 100644
--- a/debian/snap-snapcraft-lxd-proto.yml
+++ b/debian/snap-snapcraft-lxd-proto.yml
@@ -77,28 +77,6 @@ snap_snapcraft_deploy:
   inherit:
     default: true
   script:
-    - echo "KDE_SNAP_BRANCH is $KDE_SNAP_BRANCH and KDE_SNAP_CHANNEL IS $KDE_SNAP_CHANNEL"
-    - ls -lsh
-    - cat build.env
-    - export KDE_SNAP_BRANCH=$(cat build.env)
-    - |
-      # set the channel for the snap dependent on which branch we are building
-      # master = edge
-      if [ "$KDE_SNAP_BRANCH" == "master" ]; then
-          export KDE_SNAP_CHANNEL="edge"
-      # RC branch = beta
-      elif [ "$KDE_SNAP_BRANCH" == "Neon/release-24.12" ]; then
-          export KDE_SNAP_CHANNEL="beta"
-      # Branch tags = candidate
-      elif [ "$KDE_SNAP_BRANCH" == "Neon/release-24.08" ]; then
-          export KDE_SNAP_CHANNEL="candidate"
-      # new release tag (new tarball release) = stable needs to be set off manually until ephemeral vms are a thing
-      #elif [ "$KDE_SNAP_BRANCH" == "v24.08.3" ]; then
-      elif [ "$SNAP_PUBLISH_TYPE" == "manual" ]; then
-          export KDE_SNAP_CHANNEL="stable"
-      else
-          echo "this is not a publishable branch"
-      fi
     - snapcraft push --release=$KDE_SNAP_CHANNEL *.snap
   allow_failure: true
   interruptible: true