aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-22 16:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: Install make on Ubuntu

Browse Source 
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 <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt
2018-07-02 13:51:27 +01:00
parent 7a88a7c887
commit abb559d52c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/setup.sh
View File

@@ -10,8 +10,6 @@ set -e
cidir=$(dirname "$0") cidir=$(dirname "$0")
source "${cidir}/lib.sh" source "${cidir}/lib.sh"
bash "${cidir}/static-checks.sh"
#Note: If add clearlinux as supported CI use a stateless os-release file #Note: If add clearlinux as supported CI use a stateless os-release file
source /etc/os-release source /etc/os-release
@@ -22,8 +20,10 @@ elif [ "$ID" == centos ];then
sudo -E yum -y install automake yamllint coreutils moreutils sudo -E yum -y install automake yamllint coreutils moreutils
elif [ "$ID" == ubuntu ];then elif [ "$ID" == ubuntu ];then
sudo apt-get -qq update 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 sudo pip install yamllint
else else
echo "Linux distribution not supported" echo "Linux distribution not supported"
fi fi
bash "${cidir}/static-checks.sh"