[neon/ubuntu-core/ago/generate-model-in-ci] /: Undo test changes to model json

[Antoine Gonzalez]

Git commit 8006abc49cd58c3eef0fda9fc4d85e66d9a1f449 by Antoine Gonzalez.
Committed on 18/07/2024 at 14:31.
Pushed by daspood into branch 'ago/generate-model-in-ci'.

Undo test changes to model json

M  +15   -19   debian/snap-image-model.yml
M  +6    -0    kde-neon-core-amd64.json

https://invent.kde.org/neon/ubuntu-core/-/commit/8006abc49cd58c3eef0fda9fc4d85e66d9a1f449

diff --git a/debian/snap-image-model.yml b/debian/snap-image-model.yml
index f3adb8f..a9e99ea 100644
--- a/debian/snap-image-model.yml
+++ b/debian/snap-image-model.yml
@@ -9,7 +9,7 @@ snap_image_model:
   inherit:
     default: true
   script:  # Have to duplicate most of the snap-image code as the default `make` command will remove the model file
-    # make sure there is a snap specific so gpg deosn't freak out
+    # make sure there is a snap specific so gpg doesn't freak out
     - mkdir -p -m 0700 ¬/.snap/gnupg/
     - mkdir -p -m 0700 ¬/.snap/gnupg/private-keys-v1.d/
     # export it as a env var for convenience
@@ -19,33 +19,29 @@ snap_image_model:
     # copy in the required exported login creds so that snapcraft whoami works
     - echo $KDE_NEON_CORE_IMAGE_KEY > kde-neon-core-image-key
     # feed snap's gpg the required key
-#    - echo $PRIVATE_KEY | base64 --decode | gpg --batch --import
+    - echo $PRIVATE_KEY | base64 --decode | gpg --batch --import
     # make sure the key is trusted
-#    - gpg --import-ownertrust <(echo "$OWNER_TRUST")
+    - gpg --import-ownertrust <(echo "$OWNER_TRUST")
     # test the keys
-#    - gpg --list-keys
+    - gpg --list-keys
     # test the login
-#    - snapcraft whoami
+    - snapcraft whoami
     # build the model with the project's tooling
-#    - echo re-generating models for $KDE_SNAP_MODULE_NAME ...
-#    - make kde-neon-core-dangerous-amd64.model 2>&1 | tee task.log
-#    - make kde-neon-core-signed-amd64.model 2>&1 | tee task.log
+    - echo re-generating models for $KDE_SNAP_MODULE_NAME ...
+    - make kde-neon-core-dangerous-amd64.model 2>&1 | tee task.log
+    - make kde-neon-core-signed-amd64.model 2>&1 | tee task.log
     # make the artifacts dir
-#    - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/
+    - 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/
+    - 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.org"
     - git config user.name "kde-neon-core model-bot"
-    - git status  # FIXME debug
-    - git remote -v  # FIXME debug
-    - git remote add gitlab_origin https://invent.kde.org/neon/ubuntu-core.git
-#    - git remote add gitlab_origin https://oauth2:$UBUNTU_NEON_CORE_ACCESS_TOKEN@invent.kde.org:neon/ubuntu-core.git
-#    - git add ./*.model
-#    - git status  # debug
-#    - git commit -m "Update model files"
+    - git remote add gitlab_origin https://oauth2:$UBUNTU_NEON_CORE_ACCESS_TOKEN@invent.kde.org:neon/ubuntu-core.git
+    - git add ./*.model
+    - git commit -m "Update model files"
     - 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
+    - git push gitlab_origin HEAD:$CI_COMMIT_REF_NAME -o ci.skip
   interruptible: true
   after_script:
     # delete the gpg keyring
@@ -54,4 +50,4 @@ snap_image_model:
     - rm kde-neon-core-image-key
   rules:
     - changes:
-      - kde-neon-core-amd64.json  # Only re-generate the models when the base model file is changed
+      - kde-neon-core-amd64.json  # Only re-generate the models when the base model json is changed
diff --git a/kde-neon-core-amd64.json b/kde-neon-core-amd64.json
index efe3232..19c7446 100644
--- a/kde-neon-core-amd64.json
+++ b/kde-neon-core-amd64.json
@@ -120,6 +120,12 @@
             "type": "app",
             "id": "xODwiAdjx9KGChvI1z9Xx2JWJE7oLFF6"
         },
+        {
+            "name": "firefox",
+            "default-channel": "latest/stable",
+            "type": "app",
+            "id": "3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk"
+        },
         {
             "name": "kf6-core22",
             "default-channel": "latest/stable",