Capture stderr as well and work on nRF build

2 files changed, 4 insertions, 5 deletions

diff --git a/tools/build_adafruit_bins.py b/tools/build_adafruit_bins.py
index 778cfd869..94c31ad33 100755
--- a/tools/build_adafruit_bins.py
+++ b/tools/build_adafruit_bins.py
@@ -37,7 +37,7 @@ for board in build_boards:
 
     for language in languages:
         start_time = time.monotonic()
-        make_result = subprocess.run("make -C ../ports/" + board_info["port"] + " TRANSLATION=" + language + " BOARD=" + board, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        make_result = subprocess.run("make -C ../ports/" + board_info["port"] + " TRANSLATION=" + language + " BOARD=" + board, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         build_duration = time.monotonic() - start_time
         success = "\033[32msucceeded\033[0m"
         if make_result.returncode != 0:
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 2efc78c14..0e9389a02 100644
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -92,7 +92,7 @@ def get_current_info():
     response = response.json()
 
     git_info = commit_sha, response["sha"]
-    return git_info, json.loads(base64.b64decode(response["content"]))
+    return git_info, json.loads(base64.b64decode(response["content"]).decode("utf-8"))
 
 def create_pr(changes, updated, git_info):
     commit_sha, original_blob_sha = git_info
@@ -172,7 +172,7 @@ def generate_download_info():
     boards = {}
     errors = []
 
-    new_tag = os.environ.get("TRAVIS_TAG", "4.0.0-alpha.3")
+    new_tag = os.environ["TRAVIS_TAG"]
 
     changes = {
         "new_release": new_tag,
@@ -240,8 +240,7 @@ def generate_download_info():
         create_pr(changes, current_info, git_info)
 
 if __name__ == "__main__":
-    if "TRAVIS_TAG" in os.environ:
-        print("tag", os.environ["TRAVIS_TAG"])
+    if "TRAVIS_TAG" in os.environ and os.environ["TRAVIS_TAG"]:
         generate_download_info()
     else:
         print("skipping website update because this isn't a tag")