Merge pull request #2678 from adafruit/5.0.x

Merge in 5.0.x changes

.github/workflows/build.yml

@@ -273,13 +273,3 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
-    - name: Install upload deps
-      run: |
-        pip install uritemplate
-    - name: Upload to Release
-      run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
-      working-directory: tools
-      env:
-        UPLOAD_URL: ${{ github.event.release.upload_url }}
-        ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
-      if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

tools/build_board_info.py

@@ -21,6 +21,10 @@ HEX = ('hex',)
 HEX_UF2 = ('hex', 'uf2')
 SPK = ('spk',)
 
+# Example:
+# https://downloads.circuitpython.org/bin/trinket_m0/en_US/adafruit-circuitpython-trinket_m0-en_US-5.0.0-rc.0.uf2
+DOWNLOAD_BASE_URL = "https://downloads.circuitpython.org/bin"
+
 # Default extensions
 extension_by_port = {
     "nrf": UF2,
@@ -33,8 +37,10 @@ extension_by_port = {
 # Per board overrides
 extension_by_board = {
     # samd
-    "arduino_mkr1300": BIN,
+    "arduino_mkr1300": BIN_UF2,
-    "arduino_zero": BIN,
+    "arduino_mkrzero": BIN_UF2,
+    "arduino_nano_33_iot": BIN_UF2,
+    "arduino_zero": BIN_UF2,
     "feather_m0_adalogger": BIN_UF2,
     "feather_m0_basic": BIN_UF2,
     "feather_m0_rfm69": BIN_UF2,
@@ -275,7 +281,14 @@ def generate_download_info():
                         files = []
                         new_version["files"][language] = files
                         for extension in board_info["extensions"]:
-                            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))
+                            files.append(
+                                "{base_url}/{alias}/{language}/adafruit-circuitpython-{alias}-{language}-{tag}.{extension}"
+                                .format(
+                                    base_url=DOWNLOAD_BASE_URL,
+                                    tag=new_tag,
+                                    alias=alias,
+                                    language=language,
+                                    extension=extension))
                     current_info[alias]["downloads"] = alias_info["download_count"]
                     current_info[alias]["versions"].append(new_version)
 

tools/upload_release_files.py

@@ -1,35 +0,0 @@
-#! /usr/bin/env python3
-
-import os
-import os.path
-import sys
-import uritemplate
-
-sys.path.append("adabot")
-import adabot.github_requests as github
-
-exit_status = 0
-
-for dirpath, dirnames, filenames in os.walk("../bin"):
-    if not filenames:
-        continue
-    for filename in filenames:
-        full_filename = os.path.join(dirpath, filename)
-        label = filename.replace("adafruit-circuitpython-", "")
-        url_vars = {}
-        url_vars["name"] = filename
-        url_vars["label"] = label
-        url = uritemplate.expand(os.environ["UPLOAD_URL"], url_vars)
-        headers = {"content-type": "application/octet-stream"}
-        print(url)
-        with open(full_filename, "rb") as f:
-            response = github.post(url, data=f, headers=headers)
-        if not response.ok:
-            if response.status_code == 422 and response.json().get("errors", [{"code":""}])[0]["code"] == "already_exists":
-                print("File already uploaded. Skipping.")
-                continue
-            print("Upload of {} failed with {}.".format(filename, response.status_code))
-            print(response.text)
-            sys.exit(response.status_code)
-
-sys.exit(exit_status)