[neon/snap-packaging/kde-qt6-snap] debian: hyphen not underscore

Carlos De Maine null at kde.org
Fri Apr 19 00:03:11 BST 2024


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

hyphen not underscore

M  +1    -1    debian/.gitlab-ci-neon.yml
M  +1    -1    debian/snap-snapcraft-destructive.yml
M  +1    -1    debian/snap-snapcraft-lxd.yml
D  +0    -25   debian/snap_base.yml

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

diff --git a/debian/.gitlab-ci-neon.yml b/debian/.gitlab-ci-neon.yml
index 404add4..99e2c4e 100644
--- a/debian/.gitlab-ci-neon.yml
+++ b/debian/.gitlab-ci-neon.yml
@@ -6,4 +6,4 @@ include:
     file:
 #      - /gitlab-templates/snap-snapcraft-destructive.yml
 #      - /gitlab-templates/snap-snapcraft-lxd.yml
-  - local: debian/snap_snapcraft_lxd.yml
+  - local: debian/snap-snapcraft-lxd.yml
diff --git a/debian/snap-snapcraft-destructive.yml b/debian/snap-snapcraft-destructive.yml
index 7902f11..3359bed 100644
--- a/debian/snap-snapcraft-destructive.yml
+++ b/debian/snap-snapcraft-destructive.yml
@@ -2,7 +2,7 @@ include:
   - project: sysadmin/ci-utilities
     file:
       -/gitlab-templates/blocks/workflow.yml
-  - local: debian/snap_base.yml
+  - local: debian/snap-base.yml
 
 snap_snapcraft_destructive:
   extends: .snap_base
diff --git a/debian/snap-snapcraft-lxd.yml b/debian/snap-snapcraft-lxd.yml
index 1d8281c..95e302c 100644
--- a/debian/snap-snapcraft-lxd.yml
+++ b/debian/snap-snapcraft-lxd.yml
@@ -2,7 +2,7 @@ include:
   - project: sysadmin/ci-utilities
     file:
       -/gitlab-templates/blocks/workflow.yml
-  - local: debian/snap_base.yml
+  - local: debian/snap-base.yml
 
 snap_snapcraft_lxc:
   extends: .snap_base
diff --git a/debian/snap_base.yml b/debian/snap_base.yml
deleted file mode 100644
index 01d9c71..0000000
--- a/debian/snap_base.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-.snap_base:
-  stage: build
-  tags:
-    - Snap
-  variables:
-    KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
-    SNAPCRAFT_BUILD_ENVIRONMENT: "host"
-    SNAPCRAFT_MANAGED_MODE: "y"
-  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
-  artifacts:
-    name: Snap artifacts
-    expose_as: 'Snaps'
-    when: always
-    paths:
-      - "${KDE_SNAP_MODULE_NAME}*.snap"
-      - "kde-neon-core-dangerous-amd64.tar.gz"
-      - "kde-neon-core-signed-amd64.tar.gz"
-      - "task.log"
-      - "task-debug.log"
-    expire_in: 7 days


More information about the Neon-commits mailing list