Install cmake3 from EPEL on CentOS CI system

This commit is contained in:
Jon Siwek 2019-10-28 20:00:29 -07:00
parent 2613640abe
commit 36d7628bcb
4 changed files with 7 additions and 3 deletions

View file

@ -1,4 +1,8 @@
3.1.0-dev.222 | 2019-10-28 20:18:15 -0700
* Install cmake3 from EPEL on CentOS CI system (Jon Siwek, Corelight)
3.1.0-dev.221 | 2019-10-28 18:30:24 -0700
* Require CMake 3.0+ (Dominik Charousset, Corelight)

View file

@ -1 +1 @@
3.1.0-dev.221
3.1.0-dev.222

@ -1 +1 @@
Subproject commit 4a8e45b01fbe6fe32d9034cd519d6510ff9b79d5
Subproject commit 6155cb950bb5d1a29be38c2c25cc04076143f928

View file

@ -84,7 +84,7 @@ install_in_docker() {
local_distro=$distro
case $distro in
centos_7)
distro_cmds="yum -y install gdb cmake make gcc gcc-c++ flex bison libpcap-devel openssl-devel git openssl which centos-release-scl && yum -y install devtoolset-7"
distro_cmds="yum -y install gdb make gcc gcc-c++ flex bison libpcap-devel openssl-devel git openssl which centos-release-scl && yum -y install devtoolset-7 && yum -y install epel-release && yum -y install cmake3"
;;
debian_9)
distro_cmds="apt-get update; apt-get -y install gdb cmake make flex bison python libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils clang-7 libc++-7-dev libc++abi-7-dev; update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100; update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100"