Merge pull request #437 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

.cruft.json

@@ -1,10 +1,11 @@
 {
   "template": "https://github.com/vshn/appcat-cookiecutter",
-  "commit": "9e29b2c7a3cf60e3817dff61b8f39bbc811c64e7",
-  "checkout": "master",
+  "commit": "8f29fab7ec7458dacdc42e208806c5669162d87f",
+  "checkout": null,
   "context": {
     "cookiecutter": {
       "app_name": "appcat",
+      "appcat_repo": "vshn/appcat",
       "component_repo": "vshn/component-appcat",
       "push_upbound": false,
       "push_package": true,
@@ -14,7 +15,7 @@
         ".github/changelog-configuration.json"
       ],
       "_template": "https://github.com/vshn/appcat-cookiecutter",
-      "_commit": "9e29b2c7a3cf60e3817dff61b8f39bbc811c64e7"
+      "_commit": "8f29fab7ec7458dacdc42e208806c5669162d87f"
     }
   },
   "directory": null

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,7 @@
 
 - [ ] Update tests.
 - [ ] Link this PR to related issues.
+- [ ] Merge with `/merge` comment.
 
 <!--
 Remove items that do not apply. For completed items, change [ ] to [x].

.github/workflows/check.yml

@@ -0,0 +1,43 @@
+name: Check
+
+on:
+  schedule:
+    - cron: '0 7 * * *'  # Every day at 07:00 UTC
+  workflow_dispatch:
+
+jobs:
+  check-develop-ahead:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout full history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check if develop contains all commits from master
+        run: |
+          if [ -n "$(git rev-list origin/master ^origin/develop)" ]; then
+            echo "❌ develop is missing commits from master:"
+            git log origin/develop..origin/master --oneline
+            exit 1
+          else
+            echo "✅ develop includes all commits from master"
+          fi
+
+      - name: Notify Rocket.Chat if develop is behind
+        if: failure()
+        run: |
+          curl -X POST "$ROCKETCHAT_WEBHOOK_URL" \
+            -H 'Content-Type: application/json' \
+            -d "{
+              \"text\": \"🚨 *develop is behind master* in \`${{ github.repository }}\`\n🔁 Please merge \`master\` into \`develop\` to stay in sync.\",
+              \"attachments\": [{
+                \"title\": \"GitHub Workflow: ${{ github.workflow }}\",
+                \"title_link\": \"${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\",
+                \"text\": \"Triggered by: ${{ github.actor }}\",
+                \"color\": \"#ff0000\"
+              }]
+            }"
+        env:
+          ROCKETCHAT_WEBHOOK_URL: ${{ secrets.ROCKETCHAT_WEBHOOK_URL }}
+