Compare commits

..

7 Commits

Author SHA1 Message Date
Kalle
8d3a0980ce
Add url back in 2025-04-14 19:31:44 +00:00
Kalle
1b499fc020
remove url 2025-04-14 19:12:05 +00:00
Kalle
e9965a1d53
change version format 2025-04-14 19:11:41 +00:00
Kalle
9fdb19b60f
Bump version.properties to 2.6.6 2025-04-14 18:30:12 +00:00
Kalle
429ad9e70b
Switch to short version string 2025-04-14 18:22:23 +00:00
Kalle
d2682a1468
add bin/bump_metainfo/requirements.txt to renovate 2025-04-14 16:09:08 +00:00
Kalle
86c268120a
move bump_metainfo, use requirements.txt 2025-04-14 13:58:34 +00:00
6 changed files with 15 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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