[neon/snap-packaging/plasma-core-desktop-snap/ci-prototype] debian: lxd not destructive you pelican

[Carlos De Maine]

Git commit 64a6cdeaf884bc2c883fa58cd69d596c096eb311 by Carlos De Maine.
Committed on 06/05/2024 at 07:59.
Pushed by carlosdem into branch 'ci-prototype'.

lxd not destructive you pelican

M  +18   -5    debian/snap-image-snapcraft-lxd-proto.yml

https://invent.kde.org/neon/snap-packaging/plasma-core-desktop-snap/-/commit/64a6cdeaf884bc2c883fa58cd69d596c096eb311

diff --git a/debian/snap-image-snapcraft-lxd-proto.yml b/debian/snap-image-snapcraft-lxd-proto.yml
index 7ce00dc..e3a3dfc 100644
--- a/debian/snap-image-snapcraft-lxd-proto.yml
+++ b/debian/snap-image-snapcraft-lxd-proto.yml
@@ -2,12 +2,25 @@ include:
   #- /gitlab-templates/blocks/snap-base.yml
   - /gitlab-templates/blocks/workflow.yml
 
-snap_snapcraft_destructive:
-  extends: .snap_base_proto
-  image: invent-registry.kde.org/sysadmin/ci-images/snap-builder:latest
+snap_snapcraft_lxd:
+  extends: .snap_base
   inherit:
     default: true
   script:
-    - echo building $KDE_SNAP_MODULE_NAME with --destructive-mode ...
-    - snapcraft --use-lxd --destructive-mode --verbosity=verbose
+    # clean
+    - snapcraft clean
+    # choose modern or legacy snapcraft build type
+    - |
+      if [ "$KDE_SNAP_MODULE_NAME" == "plasma-desktop-session-snap" ]; then
+        export SNAPCRAFT_BUILD_ENVIRONMENT=lxd
+        echo building $KDE_SNAP_MODULE_NAME with SNAPCRAFT_BUILD_ENVIRONMENT=lxd ...
+        snapcraft --verbose
+      else
+        echo building $KDE_SNAP_MODULE_NAME with --use-lxd build flag ...
+        snapcraft  --use-lxd --verbosity=verbose
+      fi
+    # make the artifacts dir
+    - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/
+    # copy the snap to the artifacts dir
+    - cp -vf $packageDir/*.snap  $CI_PROJECT_DIR/.kde-ci-packages/
   interruptible: true