Skip to content

Commit a7d54d7

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.
1 parent 6f13389 commit a7d54d7

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
@@ -50,7 +50,7 @@ case "$distro_id" in
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
5252
yum -y install devtoolset-3-gcc-c++ devtoolset-3-gcc-c++ devtoolset-3-binutils clang cmake3 make ccache \
53-
expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel gmock-devel which python36 dos2unix
53+
expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel gmock-devel which python3 dos2unix
5454
echo source /opt/rh/devtoolset-3/enable >> ~/.bash_profile
5555
echo export CCACHE_PATH=$HOME/bin:$PATH >> ~/.bash_profile
5656
mkdir ~/bin
@@ -63,13 +63,7 @@ EOF
6363
/usr/bin/clang --gcc-toolchain=/opt/rh/devtoolset-3/root/ \$@
6464
EOF
6565
chmod +x ~/bin/clang*
66-
# symlink up to date versions of python & cmake to 'default' names
67-
if [ ! -e /usr/bin/python3 ]; then
68-
ln -s /usr/bin/python36 /usr/bin/python3
69-
elif [ -L /usr/bin/python3 ]; then
70-
rm /usr/bin/python3
71-
ln -s /usr/bin/python36 /usr/bin/python3
72-
fi
66+
# symlink up to date version of cmake to the 'default' name
7367
mv /bin/cmake /bin/.cmake.old
7468
ln -s /bin/cmake3 /bin/cmake
7569
;;

0 commit comments

Comments
 (0)