diff options
| -rwxr-xr-x | .travis.yml | 2 | ||||
| -rwxr-xr-x | ports/nrf/bluetooth/download_ble_stack.sh | 3 | ||||
| -rwxr-xr-x | tools/build_adafruit_bins.py | 2 | ||||
| -rw-r--r-- | tools/build_board_info.py | 7 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 99515ccec..543107f6e 100755 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ before_script: - (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/bluetooth/download_ble_stack.sh) # For huzzah builds - - (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xavf xtensa-lx106-elf-standalone.tar.gz)) + - (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xaf xtensa-lx106-elf-standalone.tar.gz)) - if var_search "${TRAVIS_SDK-}" esp8266 ; then PATH=$(readlink -f ../xtensa-lx106-elf/bin):$PATH; fi # For coverage testing (upgrade is used to get latest urllib3 version) diff --git a/ports/nrf/bluetooth/download_ble_stack.sh b/ports/nrf/bluetooth/download_ble_stack.sh index ab67ec795..7e35c0680 100755 --- a/ports/nrf/bluetooth/download_ble_stack.sh +++ b/ports/nrf/bluetooth/download_ble_stack.sh @@ -12,7 +12,8 @@ function download_s132_nrf52_2_0_1 cd "${1}/s132_nrf52_2.0.1" wget https://www.nordicsemi.com/api/sitecore/Products/MedialibraryZipDownload2 --post-data="ids=863031714A574444AADFE444EBE5BA9B|&fileName=DeviceDownload" -O temp.zip unzip -u temp.zip - rm temp.zip + unzip -u s132nrf52201.zip + rm temp.zip s132nrf52201.zip cd - } 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") |