Skip to content

Commit

Permalink
Fix CI on Centos/RHEL 6/7
Browse files Browse the repository at this point in the history
 * Use `./configure --with-yajl` for RHEL 6/7 due to old GCC which is
   not supported by json.hpp.

Signed-off-by: Gris Ge <fge@redhat.com>
  • Loading branch information
cathay4t committed Aug 23, 2018
1 parent a5ff277 commit fc0de36
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions test/docker_travis_test.sh
Expand Up @@ -9,6 +9,7 @@ if [ "CHK$(rpm -E %{?fedora})" != "CHK" ];then
IS_FEDORA=1
elif [ "CHK$(rpm -E %{?el7})" != "CHK" ];then
IS_RHEL=1
IS_RHEL7=1
elif [ "CHK$(rpm -E %{?el6})" != "CHK" ];then
IS_RHEL=1
IS_RHEL6=1
Expand Down Expand Up @@ -52,9 +53,15 @@ if [ "CHK$IS_RHEL6" == "CHK1" ];then
yum install python-argparse -y || exit 1
fi

if [ "CHK$IS_RHEL6$IS_RHEL7" == "CHK1" ];then
yum install yajl-devel -y || exit 1;
fi

./autogen.sh || exit 1
if [ "CHK$IS_FEDORA" == "CHK1" ];then
./configure --with-python3 || exit 1
elif [ "CHK$IS_RHEL6$IS_RHEL7" == "CHK1" ];then
./configure --with-yajl
else
./configure || exit 1
fi
Expand Down

0 comments on commit fc0de36

Please sign in to comment.