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

Capture stderr as well and work on nRF build

Browse Source
This commit is contained in:
Scott Shawcroft 2018-11-30 12:59:05 -08:00
parent cf70dc4f1c
commit df18d22a93
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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)

3
ports/nrf/bluetooth/download_ble_stack.sh
View File

@ -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 -
}

2
tools/build_adafruit_bins.py
View File

@ -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:

7
tools/build_board_info.py
View File

@ -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")