diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-25 18:28:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 18:28:59 -0400 |
| commit | 6b01f37bbf3216ac436cb2f06321a3cfdcfd8c47 (patch) | |
| tree | a2f6a42695fafedcb54f89fbbf9d677dce4c412d | |
| parent | 1fb81979b22a48c0933850f786e716a952d42c84 (diff) | |
| parent | 055725f744ad52d2d104a53713b8be458ca948d3 (diff) | |
Merge pull request #1058 from tannewt/gcc_2018q2
Update travis to gcc 2018q2.
| -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 58b40f168..220851910 100644..100755 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,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) |