[neon/snap-packaging/kde-qt6-snap] debian: use a block

[Carlos De Maine]

Git commit ed30269861570efdd471c5b8da70ca3fdda0b6e2 by Carlos De Maine.
Committed on 18/04/2024 at 02:19.
Pushed by carlosdem into branch 'master'.

use a block

M  +6    -38   debian/.gitlab-ci-neon.yml

https://invent.kde.org/neon/snap-packaging/kde-qt6-snap/-/commit/ed30269861570efdd471c5b8da70ca3fdda0b6e2

diff --git a/debian/.gitlab-ci-neon.yml b/debian/.gitlab-ci-neon.yml
index 6cca542..4122814 100644
--- a/debian/.gitlab-ci-neon.yml
+++ b/debian/.gitlab-ci-neon.yml
@@ -2,41 +2,15 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/blocks/workflow.yml
-
-snapcraft:
-  rules:
-  stage: build
-  tags:
-    - Snap
-  variables:
-    name: KDE_SNAP_BUILD_TYPE
-    value: "lxc"
-    options:
-      destructive
-      lxc
-      image-dangerous
-      image-signed
-    description: "The scraft build type. Set to 'lxc' by default."
-    KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
-    SNAPCRAFT_BUILD_ENVIRONMENT: "host"
-    SNAPCRAFT_MANAGED_MODE: "y"
-    SNAPCRAFT_STORE_CREDENTIALS: "abcdefghijklmnopqrstuvwxyz1234567890"
-  interruptible: true
-  before_script:
-    - git clone https://invent.kde.org/sysadmin/ci-utilities.git --depth=1
-    - 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
-    - echo $SNAPCRAFT_STORE_CREDENTIALS
+      - ./snap-base.yaml
 
 ## different build jobs
+workflow:
 
   rules:
     - if: $KDE_SNAP_BUILD_TYPE == "destructive"
 snapcraft_destructive:
-  extends: snapcraft
-  inherit:
-    default: true
+  extends: .snap_base
   script:
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode
     - snapcraft whoami
@@ -46,9 +20,7 @@ snapcraft_destructive:
   rules:
     - if: $KDE_SNAP_BUILD_TYPE == "lxc"
 snapcraft_lxc:
-  extends: snapcraft
-  inherit:
-    default: true
+  extends: .snap_base
   script:
     - echo $SNAPCRAFT_STORE_CREDENTIALS
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
@@ -59,9 +31,7 @@ snapcraft_lxc:
   rules:
     - if: '$KDE_SNAP_BUILD_TYPE == "image-dangerous"'
 ubuntu_image_dangerous:
-  extends: snapcraft
-  inherit:
-    default: true
+  extends: .snap_base
   script:
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
     - snapcraft whoami
@@ -71,9 +41,7 @@ ubuntu_image_dangerous:
   rules:
     - if: $KDE_SNAP_BUILD_TYPE == "image-signed"
 ubuntu_image_signed:
-  extends: snapcraft
-  inherit:
-    default: true
+  extends: .snap_base
   script:
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
     - snapcraft whoami