[neon/snap-packaging/qt6-snap-runtime] debian: Revert "doesn't like name"

Carlos De Maine null at kde.org
Wed Apr 17 10:08:07 BST 2024


Git commit f554e7381f7f0c8a668fe7d9fcb36f9df77faa04 by Carlos De Maine.
Committed on 17/04/2024 at 09:08.
Pushed by carlosdem into branch 'master'.

Revert "doesn't like name"

This reverts commit be33d51b0a796542074530c028e13bec8be2da26

M  +24   -16   debian/.gitlab-ci-neon.yml

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

diff --git a/debian/.gitlab-ci-neon.yml b/debian/.gitlab-ci-neon.yml
index afbd36e..c144a92 100644
--- a/debian/.gitlab-ci-neon.yml
+++ b/debian/.gitlab-ci-neon.yml
@@ -10,69 +10,77 @@ snapcraft:
     - Snap
   variables:
     KDE_SNAP_BUILD_TYPE:
-    value: "lxc"
+      value: "destructive"
     options:
       destructive
       lxc
       image-dangerous
       image-signed
-    description: "The Snap build. Set to 'lxc' by default."
+    description: "The Snap build. Set to 'destructive' by default."
     KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
+    KDE_SNAP_BUILD_PIPELINE_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 building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode
     - echo $SNAPCRAFT_STORE_CREDENTIALS
-workflow:
 
-  rules:
-    - if: $KDE_SNAP_BUILD_TYPE == "destructive"
 snapcraft_destructive:
   extends: snapcraft
   inherit:
     default: true
+  rules:
+    - if: $KDE_SNAP_BUILD_TYPE == "destructive"
+      interruptible: false  # Override interruptible defined at the job level.
+    - when: on_success
   script:
+    - echo $SNAPCRAFT_STORE_CREDENTIALS
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode
     - snapcraft whoami
     - snapcraft --destructive
   interruptible: true
 
-  rules:
-    - if: $KDE_SNAP_BUILD_TYPE == "lxc"
 snapcraft_lxc:
   extends: snapcraft
   inherit:
     default: true
+  rules:
+    - if: $KDE_SNAP_BUILD_TYPE == "lxc"
+      interruptible: false  # Override interruptible defined at the job level.
+    - when: on_success
   script:
-    - echo $SNAPCRAFT_STORE_CREDENTIALS
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
     - snapcraft whoami
-    - snapcraft --use-lxc
+    - snapcraft --lxc
   interruptible: true
-  
-  rules:
-    - if: '$KDE_SNAP_BUILD_TYPE == "image-dangerous"'
+
 ubuntu_image_dangerous:
   extends: snapcraft
   inherit:
     default: true
+  rules:
+    - if: '$KDE_SNAP_BUILD_TYPE == "image-dangerous"'
+      interruptible: false  # Override interruptible defined at the job level.
+    - when: on_success
   script:
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
     - snapcraft whoami
     - make dangerous
   interruptible: true
-
-  rules:
-    - if: $KDE_SNAP_BUILD_TYPE == "image-signed"
+  
 ubuntu_image_signed:
   extends: snapcraft
   inherit:
     default: true
+  rules:
+    - if: $KDE_SNAP_BUILD_TYPE == "image-signed"
+      interruptible: false  # Override interruptible defined at the job level.
+    - when: on_success
   script:
     - echo building $KDE_SNAP_MODULE_NAME in $KDE_SNAP_BUILD_TYPE mode ...
     - snapcraft whoami


More information about the Neon-commits mailing list