diff options
| -rw-r--r-- | cortex-m-rt/.travis.yml | 40 | ||||
| -rw-r--r-- | cortex-m-rt/ci/install.sh | 6 |
2 files changed, 14 insertions, 32 deletions
diff --git a/cortex-m-rt/.travis.yml b/cortex-m-rt/.travis.yml index 7bcaafe..6f17307 100644 --- a/cortex-m-rt/.travis.yml +++ b/cortex-m-rt/.travis.yml @@ -7,10 +7,7 @@ matrix: - env: TARGET=thumbv6m-none-eabi rust: stable - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv6m-none-eabi CC=clang @@ -19,10 +16,7 @@ matrix: - env: TARGET=thumbv7m-none-eabi rust: stable - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7m-none-eabi CC=clang @@ -31,10 +25,7 @@ matrix: - env: TARGET=thumbv7em-none-eabi rust: stable - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabi CC=clang @@ -43,10 +34,7 @@ matrix: - env: TARGET=thumbv7em-none-eabihf rust: stable - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabihf CC=clang @@ -55,34 +43,22 @@ matrix: - env: TARGET=thumbv6m-none-eabi rust: nightly - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7m-none-eabi rust: nightly - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabi rust: nightly - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7em-none-eabihf rust: nightly - addons: - apt: - packages: - - gcc-arm-none-eabi + sudo: true if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) before_install: set -e diff --git a/cortex-m-rt/ci/install.sh b/cortex-m-rt/ci/install.sh index 3c41921..567ca9d 100644 --- a/cortex-m-rt/ci/install.sh +++ b/cortex-m-rt/ci/install.sh @@ -3,6 +3,12 @@ set -euxo pipefail main() { if [ $TARGET != x86_64-unknown-linux-gnu ]; then rustup target add $TARGET + + if [ ${CC:-gcc} = gcc ]; then + sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y + sudo apt-get update -q + sudo apt-get install gcc-arm-embedded -y + fi fi } |