[neon/ubuntu-core/models.test] debian: fingers crossed

[Carlos De Maine]

Git commit 215619d0d102dea1118644ff8fa0bff16d2471e7 by Carlos De Maine.
Committed on 07/08/2024 at 11:38.
Pushed by carlosdem into branch 'models.test'.

fingers crossed

M  +7    -4    debian/snap-image-model.yml

https://invent.kde.org/neon/ubuntu-core/-/commit/215619d0d102dea1118644ff8fa0bff16d2471e7

diff --git a/debian/snap-image-model.yml b/debian/snap-image-model.yml
index ae9cc72..1952cff 100644
--- a/debian/snap-image-model.yml
+++ b/debian/snap-image-model.yml
@@ -35,14 +35,17 @@ snap_image_model:
     - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/
     # copy the new model to the artifacts dir
     - cp -vf ./*.model  $CI_PROJECT_DIR/.kde-ci-packages/
-    # push the new model to gitlab
     # set our identity
-    - git config --global user.email "project_17308_bot_a45360256b28775b175cf622f6b817ad at invent.kde.org"
-    - git config --global user.name "$UBUNTU_NEON_CORE_ACCESS_TOKEN"
-    # make sure we haven't got out of sync and are on the branch we want
+    - git config user.email "project_17308_bot_a45360256b28775b175cf622f6b817ad at invent.kde.org"
+    - git config user.name "project_17308_bot_a45360256b28775b175cf622f6b817ad"
+    # make sure we are on the branch we want
     - git checkout $CI_COMMIT_REF_NAME
+    # make sure we haven't got behind 
+    - git pull
+    # add the model and commit
     - git add -f ./*.model
     - git commit -m "Update models again"
+    # push the new model to gitlab
     - git push "https://project_17308_bot_a45360256b28775b175cf622f6b817ad:${UBUNTU_NEON_CORE_ACCESS_TOKEN}@invent.kde.org/neon/ubuntu-core.git HEAD:$CI_COMMIT_REF_NAME" -o ci.skip
   interruptible: true
   after_script: