[neon/snap-packaging/kde-qt6-snap] debian: ready to build

[Carlos De Maine]

Git commit b8c64a2546382ec25797168eb3db2f5454c56f11 by Carlos De Maine.
Committed on 18/04/2024 at 06:24.
Pushed by carlosdem into branch 'master'.

ready to build

M  +4    -7    debian/.gitlab-ci-neon.yml
D  +0    -16   debian/snap-base.yml
D  +0    -15   debian/snap-snapcraft-destructive.yml
D  +0    -15   debian/snap-snapcraft-lxd.yml

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

diff --git a/debian/.gitlab-ci-neon.yml b/debian/.gitlab-ci-neon.yml
index bc6f9ac..a737965 100644
--- a/debian/.gitlab-ci-neon.yml
+++ b/debian/.gitlab-ci-neon.yml
@@ -2,10 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 include:
-#  - project: sysadmin/ci-utilities
-#    file:
-#      - /gitlab-templates/snap-snapcraft-destructive
-#      - /gitlab-templates/snap-snapcraft-lxd.yml
-
-  - local: debian/snap-snapcraft-destructive.yml
-  - local: debian/snap-snapcraft-lxd.yml
\ No newline at end of file
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/snap-snapcraft-destructive
+      - /gitlab-templates/snap-snapcraft-lxd.yml
diff --git a/debian/snap-base.yml b/debian/snap-base.yml
deleted file mode 100644
index ff8c28a..0000000
--- a/debian/snap-base.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-.snap_base:
-  stage: build
-  tags:
-    - Snap
-  variables:
-    KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
-    SNAPCRAFT_BUILD_ENVIRONMENT: "host"
-    SNAPCRAFT_MANAGED_MODE: "y"
-    SNAPCRAFT_STORE_CREDENTIALS: ""
-  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
\ No newline at end of file
diff --git a/debian/snap-snapcraft-destructive.yml b/debian/snap-snapcraft-destructive.yml
deleted file mode 100644
index aeeabda..0000000
--- a/debian/snap-snapcraft-destructive.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-include:
-#  - /gitlab-templates/blocks/snap-base.yml
-#  - /gitlab-templates/blocks/workflow.yml
-  - debian/snap-base.yml
-
-dangerous:
-  extends: .snap_base
-  inherit:
-    default: true
-  script:
-    - echo credentials = $SNAPCRAFT_STORE_CREDENTIALS
-    - echo building $KDE_SNAP_MODULE_NAME with --destructive-mode ...
-    - snapcraft whoami
-    - snapcraft --destructive-mode --verbosity=debug
-  interruptible: true
diff --git a/debian/snap-snapcraft-lxd.yml b/debian/snap-snapcraft-lxd.yml
deleted file mode 100644
index e0cd5fb..0000000
--- a/debian/snap-snapcraft-lxd.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-include:
-#  - /gitlab-templates/blocks/snap-base.yml
-#  - /gitlab-templates/blocks/workflow.yml
-  - debian/snap-base.yml
-
-snapcraft_lxc:
-  extends: .snap_base
-  inherit:
-    default: true
-  script:
-    - echo $SNAPCRAFT_STORE_CREDENTIALS
-    - echo building $KDE_SNAP_MODULE_NAME with --use-lxd ...
-    - snapcraft whoami
-    - snapcraft --use-lxd --verbosity=debug
-  interruptible: true