[neon/snap-packaging/gwenview-snap/Neon/release-24.12] debian: all in the front end

[Carlos De Maine]

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

all in the front end

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

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

diff --git a/debian/snap-base-proto.yml b/debian/snap-base-proto.yml
index 19fa5fd..8c6ce76 100644
--- a/debian/snap-base-proto.yml
+++ b/debian/snap-base-proto.yml
@@ -38,26 +38,7 @@
   variables:
     GIT_STRATEGY: none
   interruptible: true
-  script:
-    - 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
+  #script:
 #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 61c5ef1..d32010a 100644
--- a/debian/snap-snapcraft-lxd-proto.yml
+++ b/debian/snap-snapcraft-lxd-proto.yml
@@ -77,9 +77,28 @@ snap_snapcraft_deploy:
   inherit:
     default: true
   script:
+    - export KDE_SNAP_BRANCH=$(cat build.env)
     - cat build.env
-    - echo "KDE_SNAP_BRANCH is $KDE_SNAP_BRANCH and KDE_SNAP_CHANNEL IS $KDE_SNAP_CHANNEL"
     - ls -lsh
+    - |
+      # 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
+    - echo "KDE_SNAP_BRANCH is $KDE_SNAP_BRANCH and KDE_SNAP_CHANNEL IS $KDE_SNAP_CHANNEL"
     - snapcraft push --release=$KDE_SNAP_CHANNEL *.snap
   allow_failure: true
   interruptible: true