.github/workflows/release_channels.yml

@@ -63,7 +63,6 @@ jobs:
       - name: Get release version string
         run: |
           echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
           echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
         id: version
         env:
@@ -94,9 +93,9 @@ jobs:
       - name: Bump org.meshtastic.meshtasticd.metainfo.xml
         shell: bash
         run: |
-          pip install -r bin/bump_metainfo/requirements.txt -q
+          pip install defusedxml -q
-          chmod +x ./bin/bump_metainfo/bump_metainfo.py
+          chmod +x ./bin/bump_metainfo.py
-          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.version.outputs.short }}"
+          ./bin/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "v${{ steps.version.outputs.long }}"
 
       - name: Create metainfo.xml pull request
         uses: peter-evans/create-pull-request@v7

bin/bump_metainfo.py

@@ -47,8 +47,9 @@ def main():
         'version': args.version,
         'date': args.date
     })
+
     url = ET.SubElement(new_release, 'url', {'type': 'details'})
-    url.text = "https://github.com/meshtastic/firmware/releases"
+    url.text = f"https://github.com/meshtastic/firmware/releases/tag/{args.version}"
 
     releases.insert(0, new_release)
 

bin/bump_metainfo/requirements.txt

@@ -1 +0,0 @@
-defusedxml==0.7.1

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,11 +87,8 @@
   </screenshots>
 
   <releases>
-    <release version="2.6.5" date="2025-04-09">
+    <release version="v2.6.4.b89355f" date="2025-04-10">
-      <url type="details">https://github.com/meshtastic/firmware/releases</url>
+      <url type="details">https://github.com/meshtastic/firmware/releases/tag/v2.6.4.b89355f</url>
-    </release>
-    <release version="2.6.4" date="2025-03-29">
-      <url type="details">https://github.com/meshtastic/firmware/releases</url>
     </release>
   </releases>
 </component>

renovate.json

@@ -13,9 +13,6 @@
   "git-submodules": {
     "enabled": true
   },
-  "pip_requirements": {
-    "fileMatch": ["bin/bump_metainfo/requirements.txt"]
-  },
   "commitMessageTopic": "{{depName}}",
   "labels": ["dependencies"],
   "customDatasources": {

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 6
+build = 5