[neon/ubuntu-core/models.add-models-pipeline] debian: Models CI: fix naming of snapcraft key in makefile

[Antoine Gonzalez]

Git commit 1de184b090d25bb60e424f63526ff7a2f2cfd2a5 by Antoine Gonzalez.
Committed on 08/08/2024 at 13:18.
Pushed by daspood into branch 'models.add-models-pipeline'.

Models CI: fix naming of snapcraft key in makefile

M  +2    -4    debian/neon-core-image-dangerous.yml
M  +3    -0    debian/neon-core-models.yml

https://invent.kde.org/neon/ubuntu-core/-/commit/1de184b090d25bb60e424f63526ff7a2f2cfd2a5

diff --git a/debian/neon-core-image-dangerous.yml b/debian/neon-core-image-dangerous.yml
index dd59aef..dbae5f4 100644
--- a/debian/neon-core-image-dangerous.yml
+++ b/debian/neon-core-image-dangerous.yml
@@ -2,10 +2,8 @@ neon_core_image_dangerous:
   rules:
     # Only build the image on master
     #- if: '$CI_COMMIT_BRANCH == master'
-    # FIXME: let it build on other branches at first for tests.
-    # Prevent branch pipelines if an MR is open on the branch.
-    - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_OPEN_MERGE_REQUESTS
-      when: never
+    # FIXME: let it build on MRs or manual triggers at first for testing.
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web"'
     # Only let it run if the required variables are present
     # These are normally defined on protected branches on our normal repository but we do the logic this way to allow someone else to set this up in their fork if they want
     - if: '$SNAPCRAFT_STORE_CREDENTIALS == null || $SNAP_GPG_PRIVATE_KEY == null || $SNAP_GPG_OWNER_TRUST == null'
diff --git a/debian/neon-core-models.yml b/debian/neon-core-models.yml
index 3288611..b1d5647 100644
--- a/debian/neon-core-models.yml
+++ b/debian/neon-core-models.yml
@@ -29,6 +29,9 @@ neon_core_models:
     # test the login
     - snapcraft whoami
 
+    # change the Makefile to use the correct key name for signing models
+    - sed -i 's/kde-neon-core-image-key/kde-snapcraft-key/g' Makefile
+
     # build the model with the project's tooling
     - echo re-generating models for $CI_PROJECT_NAME ...
     - make -B kde-neon-core-dangerous-amd64.model 2>&1 | tee task.log