Skip to content

Commit 78fc0dc

Browse files
committed
[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 e22c97e)
1 parent 49970cd commit 78fc0dc

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

ci/install_dependencies.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,8 @@ case "$distro_id" in
4949
# enable copr for gtest
5050
curl https://copr.fedorainfracloud.org/coprs/defolos/devel/repo/epel-7/defolos-devel-epel-7.repo > /etc/yum.repos.d/_copr_defolos-devel.repo
5151
yum clean all
52-
yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python36 dos2unix
53-
# symlink up to date versions of python & cmake to 'default' names
54-
if [ ! -e /usr/bin/python3 ]; then
55-
ln -s /usr/bin/python36 /usr/bin/python3
56-
elif [ -L /usr/bin/python3 ]; then
57-
rm /usr/bin/python3
58-
ln -s /usr/bin/python36 /usr/bin/python3
59-
fi
52+
yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python3 dos2unix
53+
# symlink up to date versions of cmake to 'default' name
6054
mv /bin/cmake /bin/.cmake.old
6155
ln -s /bin/cmake3 /bin/cmake
6256
;;

0 commit comments

Comments
 (0)