From 78fc0dc5d072e3c5f8b7073897a0ac422dbde55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 18 Sep 2019 23:21:22 +0200 Subject: [PATCH] [ci] Stop symlinking python36 to python3 on CentOS CentOS recently started to provide python3 by default obsoleted python36. Our manual hack broke the test suite and is no longer required. (cherry picked from commit e22c97e1cee806b9e7ecf7a06c31dab959c6c31c) --- ci/install_dependencies.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh index 7d8dde93..e27816b9 100755 --- a/ci/install_dependencies.sh +++ b/ci/install_dependencies.sh @@ -49,14 +49,8 @@ case "$distro_id" in # enable copr for gtest curl https://copr.fedorainfracloud.org/coprs/defolos/devel/repo/epel-7/defolos-devel-epel-7.repo > /etc/yum.repos.d/_copr_defolos-devel.repo yum clean all - yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python36 dos2unix - # symlink up to date versions of python & cmake to 'default' names - if [ ! -e /usr/bin/python3 ]; then - ln -s /usr/bin/python36 /usr/bin/python3 - elif [ -L /usr/bin/python3 ]; then - rm /usr/bin/python3 - ln -s /usr/bin/python36 /usr/bin/python3 - fi + yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python3 dos2unix + # symlink up to date versions of cmake to 'default' name mv /bin/cmake /bin/.cmake.old ln -s /bin/cmake3 /bin/cmake ;;