[neon/ubuntu-core/ago/generate-model-in-ci] debian: Remove 'only' rule from ci script

Antoine Gonzalez null at kde.org
Wed Jul 17 16:04:35 BST 2024


Git commit 1e3daf78063cfba1c9b7bbae75e784fdf5095c1f by Antoine Gonzalez.
Committed on 17/07/2024 at 15:04.
Pushed by daspood into branch 'ago/generate-model-in-ci'.

Remove 'only' rule from ci script

M  +6    -6    debian/snap-image-model-dangerous.yml
M  +4    -4    debian/snap-image-model-signed.yml

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

diff --git a/debian/snap-image-model-dangerous.yml b/debian/snap-image-model-dangerous.yml
index da8ebbb..a0874a6 100644
--- a/debian/snap-image-model-dangerous.yml
+++ b/debian/snap-image-model-dangerous.yml
@@ -34,12 +34,15 @@ snap_image_model_dangerous:
     # copy the new model to the artifacts dir
     - cp -vf ./*.model  $CI_PROJECT_DIR/.kde-ci-packages/
     # push the new model to gitlab
-    - git config user.email "kde-neon-core-model-bot at kde.net"
-    - git config user.name "kde-neon-core-model-bot"
+    - git config user.email "kde-neon-core-model-bot at kde.org"
+    - git config user.name "kde-neon-core model-bot"
     - git remote add gitlab_origin https://oauth2:$UBUNTU_NEON_CORE_ACCESS_TOKEN@invent.kde.org:neon/ubuntu-core.git
     - git add kde-neon-core-dangerous-amd64.model
+    - git status  # debug
     - git commit -m "Update signed model file"
-    - git push gitlab_origin HEAD:main -o ci.skip
+    - git status  # debug
+    - echo "git push gitlab_origin HEAD:$CI_COMMIT_REF_NAME -o ci.skip"  # debug
+    #- git push gitlab_origin HEAD:$CI_COMMIT_REF_NAME -o ci.skip
   interruptible: true
   after_script:
     # delete the gpg keyring
@@ -49,6 +52,3 @@ snap_image_model_dangerous:
   rules:
     changes:
       - kde-neon-core-amd64.json  # Only re-generate the models when the base model file is changed
-  only:
-    refs:
-      - master  # Only re-generate the models for changes that make it to master
diff --git a/debian/snap-image-model-signed.yml b/debian/snap-image-model-signed.yml
index b2f0375..d36309b 100644
--- a/debian/snap-image-model-signed.yml
+++ b/debian/snap-image-model-signed.yml
@@ -38,8 +38,11 @@ snap_image_model_signed:
     - git config user.name "kde-neon-core model-bot"
     - git remote add gitlab_origin https://oauth2:$UBUNTU_NEON_CORE_ACCESS_TOKEN@invent.kde.org:neon/ubuntu-core.git
     - git add kde-neon-core-signed-amd64.model
+    - git status  # debug
     - git commit -m "Update signed model file"
-    - git push gitlab_origin HEAD:main -o ci.skip
+    - git status  # debug
+    - echo "git push gitlab_origin HEAD:$CI_COMMIT_REF_NAME -o ci.skip"  # debug
+    #- git push gitlab_origin HEAD:$CI_COMMIT_REF_NAME -o ci.skip
   interruptible: true
   after_script:
     # delete the gpg keyring
@@ -49,6 +52,3 @@ snap_image_model_signed:
   rules:
     changes:
       - kde-neon-core-amd64.json  # Only re-generate the models when the base model file is changed
-  only:
-    refs:
-      - master  # Only re-generate the models for changes that make it to master


More information about the Neon-commits mailing list