mirror of
https://github.com/meshtastic/firmware.git
synced 2025-02-26 22:33:24 +00:00
meshtasticd-debian: Include run in version (#5762)
This commit is contained in:
parent
b0087fd328
commit
403fa15a3f
@ -1,6 +1,7 @@
|
|||||||
import configparser
|
import configparser
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import os
|
||||||
|
run_number = os.getenv('GITHUB_RUN_NUMBER', '0')
|
||||||
|
|
||||||
def readProps(prefsLoc):
|
def readProps(prefsLoc):
|
||||||
"""Read the version of our project as a string"""
|
"""Read the version of our project as a string"""
|
||||||
@ -29,12 +30,12 @@ def readProps(prefsLoc):
|
|||||||
# # short for 'dirty', we want to keep our verstrings source for protobuf reasons
|
# # short for 'dirty', we want to keep our verstrings source for protobuf reasons
|
||||||
# suffix = sha + "-d"
|
# suffix = sha + "-d"
|
||||||
verObj["long"] = "{}.{}".format(verObj["short"], suffix)
|
verObj["long"] = "{}.{}".format(verObj["short"], suffix)
|
||||||
verObj["deb"] = "{}-ppa{}".format(verObj["short"], sha)
|
verObj["deb"] = "{}-{}~ppa{}".format(verObj["short"], run_number, sha)
|
||||||
except:
|
except:
|
||||||
# print("Unexpected error:", sys.exc_info()[0])
|
# print("Unexpected error:", sys.exc_info()[0])
|
||||||
# traceback.print_exc()
|
# traceback.print_exc()
|
||||||
verObj["long"] = verObj["short"]
|
verObj["long"] = verObj["short"]
|
||||||
verObj["deb"] = "{}-ppa".format(verObj["short"])
|
verObj["deb"] = "{}-{}~ppa".format(verObj["short"], run_number)
|
||||||
|
|
||||||
# print("firmware version " + verStr)
|
# print("firmware version " + verStr)
|
||||||
return verObj
|
return verObj
|
||||||
|
Loading…
Reference in New Issue
Block a user