third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ci] Stop symlinking python36 to python3 on CentOS

Browse Source 
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)
This commit is contained in:
Dan Čermák 2019-09-18 23:21:22 +02:00
parent 49970cd820
commit 78fc0dc5d0
No known key found for this signature in database
GPG Key ID: E632C3380610D1C5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ci/install_dependencies.sh
View File

@ -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
;;