[neon/snap-packaging/gwenview-snap/Neon/release-24.05] debian: stable

[Carlos De Maine]

Git commit 0011a47d4cd33ade2cbcad616e4a5578ebd54640 by Carlos De Maine.
Committed on 19/08/2024 at 23:09.
Pushed by carlosdem into branch 'Neon/release-24.05'.

stable

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

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

diff --git a/debian/snap-base-proto.yml b/debian/snap-base-proto.yml
index 32203f5..818705b 100644
--- a/debian/snap-base-proto.yml
+++ b/debian/snap-base-proto.yml
@@ -5,6 +5,7 @@
   variables:
     KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
     KDE_SNAP_BRANCH: $CI_COMMIT_REF_NAME
+    KDE_SNAP_CHANNEL: "default"
     SNAPCRAFT_BUILD_ENVIRONMENT: "lxd"
     SNAPCRAFT_MANAGED_MODE: "y"
   interruptible: true
@@ -13,16 +14,6 @@
     - git clone https://invent.kde.org/sysadmin/repo-metadata.git ci-utilities/repo-metadata/ --depth=1
   script:
     - git config --global --add safe.directory $CI_PROJECT_DIR
-    - |
-      if [ "$KDE_SNAP_BRANCH" == "Neon/master" ]; then
-        $KDE_SNAP_CHANNEL = "edge"
-      done
-      if [ "$KDE_SNAP_BRANCH" == "Neon/release-24.08" ]; then
-        $KDE_SNAP_CHANNEL = "candidate"
-      done
-      if [ "$KDE_SNAP_BRANCH" == "Neon/release-24.05" ]; then
-        $KDE_SNAP_CHANNEL = "stable"
-      done
   artifacts:
     name: Snap artifacts
     expose_as: 'KDE neon snaps'
diff --git a/debian/snap-snapcraft-lxd-proto.yml b/debian/snap-snapcraft-lxd-proto.yml
index 9fb8b59..4f16303 100644
--- a/debian/snap-snapcraft-lxd-proto.yml
+++ b/debian/snap-snapcraft-lxd-proto.yml
@@ -33,10 +33,21 @@ snap_snapcraft_lxd:
         done
       fi
   script:
+    # choose channel for publishing based on branch
+    - |
+      if [ "$KDE_SNAP_BRANCH" == "Neon/master" ]; then 
+        export KDE_SNAP_CHANNEL="edge" 
+      fi
+      if [ "$KDE_SNAP_BRANCH" == "Neon/release-24.08" ]; then
+        export KDE_SNAP_CHANNEL="candidate"
+      fi
+      if [ "$KDE_SNAP_BRANCH" == "Neon/release-24.05" ]; then
+        export KDE_SNAP_CHANNEL="stable"
+      fi
     # clean
     - snapcraft clean
     # Force usage of LXD for building Snaps
-    - echo building $KDE_SNAP_MODULE_NAME with LXD for branch $KDE_SNAP_BRANCH...
+    - echo building $KDE_SNAP_MODULE_NAME with LXD for branch $KDE_SNAP_BRANCH and we will publish to $KDE_SNAP_CHANNEL
     - snapcraft --use-lxd --verbose 2>&1 | tee task.log
     # Make the artifacts dir
     - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/