From f77607ee8a28f053e2dfb088495a5dd95da37393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 22 Apr 2021 08:34:37 +0200 Subject: [PATCH] ci: fix issues on Github actions --- ci/install_dependencies.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh index a916b7f3..f32ac839 100755 --- a/ci/install_dependencies.sh +++ b/ci/install_dependencies.sh @@ -10,7 +10,13 @@ debian_build_gtest() { cd gtest_build cmake -DBUILD_SHARED_LIBS=1 /usr/src/googletest/googletest make - cp lib/libgtest* /usr/lib/ + if [ -f "lib/libgtest.so" ]; then + # Ubuntu 20.04 with gtest 1.10 + cp lib/libgtest* /usr/lib/ + else + # Debian 9 with gtest 1.8 + cp libgtest* /usr/lib/ + fi cd .. } @@ -57,7 +63,7 @@ case "$distro_id" in 'opensuse'|'opensuse-tumbleweed') zypper --non-interactive refresh - zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel curl tar libcurl-devel git which dos2unix libxml2-tools + zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel curl tar libcurl-devel git which dos2unix libxml2-tools gzip pushd /tmp curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz tar xzf release-1.8.0.tar.gz