[travis] remove lib32z1 from arm-gcc-6/7 build checks (#2928)

This commit is contained in:
Jonathan Hui
2018-07-30 10:46:28 -05:00
committed by GitHub
parent d24b02ea79
commit ffff5f3f6f
3 changed files with 13 additions and 15 deletions
+4 -4
View File
@@ -92,16 +92,16 @@ matrix:
- llvm-toolchain-trusty-5.0
packages:
- clang-5.0
- env: BUILD_TARGET="arm-gcc49"
- env: BUILD_TARGET="arm-gcc-4"
os: linux
compiler: gcc
- env: BUILD_TARGET="arm-gcc54"
- env: BUILD_TARGET="arm-gcc-5"
os: linux
compiler: gcc
- env: BUILD_TARGET="arm-gcc63"
- env: BUILD_TARGET="arm-gcc-6"
os: linux
compiler: gcc
- env: BUILD_TARGET="arm-gcc7"
- env: BUILD_TARGET="arm-gcc-7"
os: linux
compiler: gcc
- env: BUILD_TARGET="posix" CC=clang-5.0 CXX=clang++-5.0
+5 -7
View File
@@ -60,7 +60,7 @@ cd /tmp || die
sudo apt-get install clang || die
}
[ $BUILD_TARGET != arm-gcc49 ] || {
[ $BUILD_TARGET != arm-gcc-4 ] || {
sudo apt-get install lib32z1 || die
wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 || die
tar xjf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 || die
@@ -68,16 +68,15 @@ cd /tmp || die
arm-none-eabi-gcc --version || die
}
[ $BUILD_TARGET != arm-gcc54 ] || {
[ $BUILD_TARGET != arm-gcc-5 ] || {
sudo apt-get install lib32z1 || die
wget https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/+download/gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/5_4-2016q3/gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
tar xjf gcc-arm-none-eabi-5_4-2016q3-20160926-linux.tar.bz2 || die
export PATH=/tmp/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH || die
arm-none-eabi-gcc --version || die
}
[ $BUILD_TARGET != arm-gcc63 ] || {
sudo apt-get install lib32z1 || die
[ $BUILD_TARGET != arm-gcc-6 ] || {
wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 || die
tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 || die
export PATH=/tmp/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH || die
@@ -89,8 +88,7 @@ cd /tmp || die
arc-elf32-gcc --version || die
}
[ $BUILD_TARGET != arm-gcc7 ] || {
sudo apt-get install lib32z1 || die
[ $BUILD_TARGET != arm-gcc-7 ] || {
wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2 || die
tar xjf gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2 || die
export PATH=/tmp/gcc-arm-none-eabi-7-2017-q4-major/bin:$PATH || die
+4 -4
View File
@@ -121,7 +121,7 @@ EOF
test -f out/target/product/generic/obj/EXECUTABLES/ot-cli_intermediates/LINKED/ot-cli || die
}
[ $BUILD_TARGET != arm-gcc49 ] || {
[ $BUILD_TARGET != arm-gcc-4 ] || {
export PATH=/tmp/gcc-arm-none-eabi-4_9-2015q3/bin:$PATH || die
git checkout -- . || die
@@ -199,7 +199,7 @@ EOF
arm-none-eabi-size output/samr21/bin/ot-ncp-mtd || die
}
[ $BUILD_TARGET != arm-gcc54 ] || {
[ $BUILD_TARGET != arm-gcc-5 ] || {
export PATH=/tmp/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH || die
git checkout -- . || die
@@ -277,7 +277,7 @@ EOF
arm-none-eabi-size output/samr21/bin/ot-ncp-mtd || die
}
[ $BUILD_TARGET != arm-gcc63 ] || {
[ $BUILD_TARGET != arm-gcc-6 ] || {
export PATH=/tmp/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH || die
git checkout -- . || die
@@ -366,7 +366,7 @@ EOF
arc-elf32-size output/emsk/bin/ot-ncp-mtd || die
}
[ $BUILD_TARGET != arm-gcc7 ] || {
[ $BUILD_TARGET != arm-gcc-7 ] || {
export PATH=/tmp/gcc-arm-none-eabi-7-2017-q4-major/bin:$PATH || die
git checkout -- . || die