From 4526fb3eae6ed5fdbc5f6cf64a56b4471b54f9d0 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 17 Jun 2020 14:47:08 +0200 Subject: [PATCH 1/3] travis: use mpc85xx-p2020 sdk instead of ar71xx Target ar71xx is deprecated and removed in the master branch and makes SDK not available anymore. Travis fails because of that. It was superseded by target ath79. These devices have 4 MB flash and/or 32 MB RAM. However, ath79 is being used by CircleCI if you have it configured for your repository and if you are contributing to this repository. It is not good to have two CI for the same target. Let's use powerpc. Signed-off-by: Josef Schlehofer --- .travis_do.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis_do.sh b/.travis_do.sh index f55b3264e..af37fc3c7 100755 --- a/.travis_do.sh +++ b/.travis_do.sh @@ -5,8 +5,8 @@ set -e SDK_HOME="$HOME/sdk" -SDK_PATH=https://downloads.openwrt.org/snapshots/targets/ar71xx/generic/ -SDK=-sdk-ar71xx-generic_ +SDK_PATH=https://downloads.openwrt.org/snapshots/targets/mpc85xx/p2020/ +SDK=-sdk-mpc85xx-p2020_ PACKAGES_DIR="$PWD" echo_red() { printf "\033[1;31m$*\033[m\n"; } From 995822b5f765228dc5d4496b37eb7033d3fc6e7e Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Fri, 19 Jun 2020 20:22:59 +0200 Subject: [PATCH 2/3] travis: Use Ubuntu 20.04 LTS - Focal Fossa Signed-off-by: Josef Schlehofer --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ed58c807..cff010c05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ git: quiet: true language: c -dist: bionic +dist: focal sudo: false cache: directories: From 651b9f9bf1d1feedc0895e6f2de2ae58002bbc99 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Fri, 19 Jun 2020 20:51:53 +0200 Subject: [PATCH 3/3] travis: improve build config Build config validation showed up 1 warning, 1 info - deprecated sudo - missing os Signed-off-by: Josef Schlehofer --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cff010c05..5f03189e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ git: quiet: true language: c +os: linux dist: focal -sudo: false cache: directories: - $HOME/sdk