From bab1d0b3799cc544344d7c0ebad954a8b07beb81 Mon Sep 17 00:00:00 2001 From: Victor Gaydov Date: Tue, 13 Aug 2024 16:18:57 +0400 Subject: [PATCH] ci: Use libs from distro where possible --- scripts/ci_checks/linux-x86_64/alpine.sh | 2 +- scripts/ci_checks/linux-x86_64/archlinux.sh | 2 +- scripts/ci_checks/linux-x86_64/debian.sh | 2 +- scripts/ci_checks/linux-x86_64/fedora.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ci_checks/linux-x86_64/alpine.sh b/scripts/ci_checks/linux-x86_64/alpine.sh index 841057292..8d6d87897 100755 --- a/scripts/ci_checks/linux-x86_64/alpine.sh +++ b/scripts/ci_checks/linux-x86_64/alpine.sh @@ -7,5 +7,5 @@ scons -Q \ --enable-tests \ --enable-benchmarks \ --enable-examples \ - --build-3rdparty=openfec,cpputest,google-benchmark \ + --build-3rdparty=openfec,google-benchmark \ test diff --git a/scripts/ci_checks/linux-x86_64/archlinux.sh b/scripts/ci_checks/linux-x86_64/archlinux.sh index ea88bcf2f..aefdd7c6e 100755 --- a/scripts/ci_checks/linux-x86_64/archlinux.sh +++ b/scripts/ci_checks/linux-x86_64/archlinux.sh @@ -8,5 +8,5 @@ scons -Q \ --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=openfec,cpputest,google-benchmark:1.5.5 \ + --build-3rdparty=openfec,cpputest \ test diff --git a/scripts/ci_checks/linux-x86_64/debian.sh b/scripts/ci_checks/linux-x86_64/debian.sh index cda51f1f6..12cd9f06a 100755 --- a/scripts/ci_checks/linux-x86_64/debian.sh +++ b/scripts/ci_checks/linux-x86_64/debian.sh @@ -8,5 +8,5 @@ scons -Q \ --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=libuv,openfec,cpputest \ + --build-3rdparty=libuv,openfec \ test diff --git a/scripts/ci_checks/linux-x86_64/fedora.sh b/scripts/ci_checks/linux-x86_64/fedora.sh index aefdd7c6e..ed6e9a723 100755 --- a/scripts/ci_checks/linux-x86_64/fedora.sh +++ b/scripts/ci_checks/linux-x86_64/fedora.sh @@ -8,5 +8,5 @@ scons -Q \ --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=openfec,cpputest \ + --build-3rdparty=openfec \ test diff --git a/scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh b/scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh index 081673c30..6e291ea64 100755 --- a/scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh +++ b/scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh @@ -10,7 +10,7 @@ do --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=openfec,google-benchmark \ + --build-3rdparty=openfec,cpputest,google-benchmark \ --compiler=${comp} \ test done diff --git a/scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh b/scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh index b585fbf9b..dd1637cc9 100755 --- a/scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh +++ b/scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh @@ -9,7 +9,7 @@ do --enable-tests \ --enable-benchmarks \ --enable-examples \ - --build-3rdparty=openfec \ + --build-3rdparty=openfec,cpputest \ --compiler=${comp} \ test done