[ci skip] update deployment

.gitea/workflows/build_container.yaml

@@ -16,6 +16,19 @@ jobs:
 
     - uses: https://gitea.com/actions/checkout@v4
 
+    - name: Fetch tags from main branch
+      id: version
+      run: |
+        git fetch origin main --tags
+        LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+        # remove the 'v' prefix from the tag name
+        echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_OUTPUT
+
+    - name: Output the version that is being used
+      run: |
+        echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
+
+
     - name: Login to Docker Registry
       uses: docker/login-action@v3
       with:
@@ -23,6 +36,8 @@ jobs:
         username: ${{ gitea.repository_owner }}
         password: ${{ secrets.PACKAGE_REGISTRY_ACCESS }}
 
+
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
@@ -31,5 +46,5 @@ jobs:
       with:
         context: .
         # use the current commit SHA as the tag
-        tags: git.kluster.moll.re/remoll/journal-bot:${{ gitea.sha }}
+        tags: git.kluster.moll.re/remoll/journal-bot:${{ steps.version.outputs.BUILD_NAME }}-${{ gitea.run_number }}
         push: true

bot/cronjob/leaderboard.py

@@ -49,14 +49,11 @@ class SendLeaderboard():
         else:
             # set the message sending time; include UTC shift +2
             sending_time = time(hour=12, minute=0, second=0, tzinfo=timezone(timedelta(hours=2)))
-            job_queue.run_daily(self.callback_leaderboard, when=sending_time, day=-1)
+            job_queue.run_daily(self.callback_leaderboard, time=sending_time, days=(0,))
 
 
     async def callback_leaderboard(self, context):
         """Send a weakly leaderboard to the chat."""
-        if date.today().weekday() != 1:
-            self.logger.info("Today is not Monday, skipping leaderboard.")
-            return
 
         # get the top contributions of the past week, month and year:
         ranking_week = get_author_ranking(7)

deployment/kustomization.yaml

@@ -12,4 +12,4 @@ namespace: journal
 images:
 - name: journal
   newName: git.kluster.moll.re/remoll/journal-bot
-  newTag: 29d951427d6f3377e43767916cefb07e03e9eab8
+  newTag: 1.1.0-17

renovate.json5

@@ -1,18 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "dependencyDashboard": true,
-  "regexManagers": [
-    {
-      "fileMatch": ["kustomization\\.yaml"],
-      "matchStrings": [
-        "- name:\\s*(?<depName>\\S+)\\s*\\n\\s*newName:\\s*(?<lookupName>\\S+)\\s*\\n\\s*newTag:\\s*(?<currentValue>[a-f0-9]{7,40})"
-      ],
-      "datasourceTemplate": "docker",
-      "versioningTemplate": "loose",
-      "extractVersionTemplate": "{{ currentValue }}",
-      "lookupNameTemplate": "{{ lookupName }}"
-    },
-  ],
   "packageRules": [
     // Fully automatically update the container version referenced in the deployment
     {
@@ -24,8 +12,6 @@
       "registryUrls": [
         "https://git.kluster.moll.re"
       ],
-      // Since the images use the commit sha as their tag, simply match any tag
-      "versioning": "regex:(.*)"
     }
   ],
 }