djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add alias support for unique board revs

Browse Source 
This way we can list different board styles and track their
downloads without a completely new binary.

Fixes #1673
This commit is contained in:
Scott Shawcroft 2019-04-11 11:25:04 -07:00
parent cf3f3e510c
commit 1eb1430d82
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tools/build_board_info.py
View File

@ -42,6 +42,12 @@ extension_by_board = {
"pca10059": BIN_UF2 "pca10059": BIN_UF2
} }
aliases_by_board = {
"circuitplayground_express": ["circuitplayground_express_4h", "circuitplayground_express_digikey_pycon2019"],
"gemma_m0": ["gemma_m0_pycon2018"],
"pewpew10": ["pewpew13"]
}
def get_languages(): def get_languages():
languages = [] languages = []
for f in os.scandir("../locale"): for f in os.scandir("../locale"):
@ -59,7 +65,17 @@ def get_board_mapping():
board_id = board_path.name board_id = board_path.name
extensions = extension_by_port[port] extensions = extension_by_port[port]
extensions = extension_by_board.get(board_path.name, extensions) extensions = extension_by_board.get(board_path.name, extensions)
boards[board_id] = {"port": port, "extensions": extensions, "download_count": 0} aliases = aliases_by_board.get(board_path.name, [])
boards[board_id] = {"port": port,
"extensions": extensions,
"download_count": 0,
"aliases": aliases}
for alias in aliases:
boards[alias] = {"port": port,
"extensions": extensions,
"download_count": 0,
"alias": True,
"aliases": []}
return boards return boards
def get_version_info(): def get_version_info():
@ -235,23 +251,25 @@ def generate_download_info():
board_id = board_path.name board_id = board_path.name
board_info = board_mapping[board_id] board_info = board_mapping[board_id]
if board_id not in current_info: for alias in [board_id] + board_info["aliases"]:
changes["new_boards"].append(board_id) alias_info = board_mapping[alias]
current_info[board_id] = {"downloads": 0, if alias not in current_info:
"versions": []} changes["new_boards"].append(alias)
current_info[alias] = {"downloads": 0,
"versions": []}
new_version = { new_version = {
"stable": new_stable, "stable": new_stable,
"version": new_tag, "version": new_tag,
"files": {} "files": {}
} }
for language in languages: for language in languages:
files = [] files = []
new_version["files"][language] = files new_version["files"][language] = files
for extension in board_info["extensions"]: for extension in board_info["extensions"]:
files.append("https://github.com/adafruit/circuitpython/releases/download/{tag}/adafruit-circuitpython-{board}-{language}-{tag}.{extension}".format(tag=new_tag, board=board_id, language=language, extension=extension)) files.append("https://github.com/adafruit/circuitpython/releases/download/{tag}/adafruit-circuitpython-{alias}-{language}-{tag}.{extension}".format(tag=new_tag, alias=alias, language=language, extension=extension))
current_info[board_id]["downloads"] = board_info["download_count"] current_info[alias]["downloads"] = alias_info["download_count"]
current_info[board_id]["versions"].append(new_version) current_info[alias]["versions"].append(new_version)
changes["new_languages"] = set(languages) - previous_languages changes["new_languages"] = set(languages) - previous_languages

19
tools/build_release_files.py
View File

@ -48,14 +48,17 @@ for board in build_boards:
for extension in board_info["extensions"]: for extension in board_info["extensions"]:
temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension) temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension)
final_filename = "adafruit-circuitpython-{board}-{language}-{version}.{extension}".format(board=board, language=language, version=version, extension=extension) for alias in board_info["aliases"] + [board]:
final_filename = os.path.join(bin_directory, final_filename) bin_directory = "../bin/{alias}/{language}".format(alias=alias, language=language)
try: os.makedirs(bin_directory, exist_ok=True)
shutil.copyfile(temp_filename, final_filename) final_filename = "adafruit-circuitpython-{alias}-{language}-{version}.{extension}".format(alias=alias, language=language, version=version, extension=extension)
except FileNotFoundError: final_filename = os.path.join(bin_directory, final_filename)
other_output = "Cannot find file {}".format(temp_filename) try:
if exit_status == 0: shutil.copyfile(temp_filename, final_filename)
exit_status = 1 except FileNotFoundError:
other_output = "Cannot find file {}".format(temp_filename)
if exit_status == 0:
exit_status = 1
if travis: if travis:
print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board)) print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board))