diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-28 14:13:54 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-07-28 14:13:54 -0400 |
| commit | 2e260a0eab80dfd47fe319edb3173d112960a862 (patch) | |
| tree | 75a5c1b0da652c81832eaf30ce845463b51ed9b5 /.travis.yml | |
| parent | f48b70050e3e4122eaae3eee47d35fc30bda2a4c (diff) | |
| parent | fbfc9c39957b389fd359ed8107d1e244e9749930 (diff) | |
Merge remote-tracking branch 'adafruit/master' into micropython-25ae98f-merge
Diffstat (limited to '.travis.yml')
| -rwxr-xr-x[-rw-r--r--] | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9a23a9be7..6c19322bf 100644..100755 --- a/.travis.yml +++ b/.travis.yml @@ -51,8 +51,8 @@ before_script: - sudo dpkg --add-architecture i386 - ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y qemu-system) - - ([[ -z "$TRAVIS_BOARD" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2017q4-1~trusty3_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) - - ([[ $TRAVIS_TEST != "qemu" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2017q4-1~trusty3_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) + - ([[ -z "$TRAVIS_BOARD" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) + - ([[ $TRAVIS_TEST != "qemu" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) # For nrf builds - ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh) |