From abb559d52c2d07c8f7a00780dd0c6fe3dc16db7b Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Mon, 2 Jul 2018 13:51:27 +0100 Subject: [PATCH] CI: Install make on Ubuntu Fix CI build failures on Ubuntu 16.04 due to `make` not being installed before the static check script runs by: - Installing make explicitly on Ubuntu. - Moving the static-check script after the package install setup phase. Fixes #134. Signed-off-by: James O. D. Hunt --- .ci/setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index b014198b2f..208eaf8547 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -10,8 +10,6 @@ set -e cidir=$(dirname "$0") source "${cidir}/lib.sh" -bash "${cidir}/static-checks.sh" - #Note: If add clearlinux as supported CI use a stateless os-release file source /etc/os-release @@ -22,8 +20,10 @@ elif [ "$ID" == centos ];then sudo -E yum -y install automake yamllint coreutils moreutils elif [ "$ID" == ubuntu ];then sudo apt-get -qq update - sudo apt-get install -y -qq automake qemu-utils python-pip coreutils moreutils + sudo apt-get install -y -qq make automake qemu-utils python-pip coreutils moreutils sudo pip install yamllint else echo "Linux distribution not supported" fi + +bash "${cidir}/static-checks.sh"