From 104a641a618ed8d7a498065d1d589a4c395f38ec Mon Sep 17 00:00:00 2001 From: Hunter Rick Date: Thu, 14 Dec 2023 12:41:20 -0800 Subject: [PATCH] Modified all CI tests to include sndfile --- scripts/android_emu/run.sh | 2 +- scripts/ci_checks/android/linux.sh | 2 +- scripts/ci_checks/linux-arm/aarch64-linux-gnu-gcc-7.4.sh | 2 +- .../linux-arm/arm-bcm2708hardfp-linux-gnueabi-gcc-4.7.sh | 2 +- scripts/ci_checks/linux-arm/arm-linux-gnueabihf-gcc-4.9.sh | 2 +- scripts/ci_checks/linux-checks/conditional-build.sh | 4 +++- 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/opensuse.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-14.04.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-16.04.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-18.04.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-20.04.sh | 2 +- scripts/ci_checks/linux-x86_64/ubuntu-22.04.sh | 2 +- scripts/ci_checks/macos/standard-build.sh | 2 +- 17 files changed, 19 insertions(+), 17 deletions(-) diff --git a/scripts/android_emu/run.sh b/scripts/android_emu/run.sh index 6998f3a469..bb5082d5ae 100755 --- a/scripts/android_emu/run.sh +++ b/scripts/android_emu/run.sh @@ -73,7 +73,7 @@ then --enable-tests \ --disable-soversion \ --disable-tools \ - --build-3rdparty=libuv,openfec,openssl,speexdsp,cpputest + --build-3rdparty=libuv,openfec,openssl,speexdsp,cpputest,sndfile fi if [[ "${action}" == prep ]] diff --git a/scripts/ci_checks/android/linux.sh b/scripts/ci_checks/android/linux.sh index cd0cb6726d..0d880d2b5e 100755 --- a/scripts/ci_checks/android/linux.sh +++ b/scripts/ci_checks/android/linux.sh @@ -7,6 +7,6 @@ scons -Q \ --disable-soversion \ --disable-tools \ --enable-tests \ - --build-3rdparty=libuv,openfec,speexdsp,openssl,cpputest \ + --build-3rdparty=libuv,openfec,speexdsp,openssl,cpputest,sndfile \ --compiler=clang \ --host="$1" diff --git a/scripts/ci_checks/linux-arm/aarch64-linux-gnu-gcc-7.4.sh b/scripts/ci_checks/linux-arm/aarch64-linux-gnu-gcc-7.4.sh index 40cae407c4..9fdd4ca40d 100755 --- a/scripts/ci_checks/linux-arm/aarch64-linux-gnu-gcc-7.4.sh +++ b/scripts/ci_checks/linux-arm/aarch64-linux-gnu-gcc-7.4.sh @@ -6,7 +6,7 @@ toolchain="aarch64-linux-gnu" compiler="gcc-7.4.1-release" cpu="cortex-a53" # armv8 -third_party="libuv,libunwind,openfec,alsa,speexdsp,sox,openssl,cpputest" +third_party="libuv,libunwind,openfec,alsa,speexdsp,sox,openssl,cpputest,sndfile" for pulse_ver in 8.0 15.99.1 do diff --git a/scripts/ci_checks/linux-arm/arm-bcm2708hardfp-linux-gnueabi-gcc-4.7.sh b/scripts/ci_checks/linux-arm/arm-bcm2708hardfp-linux-gnueabi-gcc-4.7.sh index 8f0c36d3a7..128bfc4b72 100755 --- a/scripts/ci_checks/linux-arm/arm-bcm2708hardfp-linux-gnueabi-gcc-4.7.sh +++ b/scripts/ci_checks/linux-arm/arm-bcm2708hardfp-linux-gnueabi-gcc-4.7.sh @@ -6,7 +6,7 @@ toolchain="arm-bcm2708hardfp-linux-gnueabi" compiler="gcc-4.7.1-release" cpu="arm1176" # armv6 -third_party="libuv,libunwind,libatomic_ops,openfec,alsa,pulseaudio:5.0,speexdsp,sox,openssl,cpputest" +third_party="libuv,libunwind,libatomic_ops,openfec,alsa,pulseaudio:5.0,speexdsp,sox,openssl,cpputest,sndfile" scons -Q \ --enable-werror \ diff --git a/scripts/ci_checks/linux-arm/arm-linux-gnueabihf-gcc-4.9.sh b/scripts/ci_checks/linux-arm/arm-linux-gnueabihf-gcc-4.9.sh index 0b474ab02b..e877ac7a4c 100755 --- a/scripts/ci_checks/linux-arm/arm-linux-gnueabihf-gcc-4.9.sh +++ b/scripts/ci_checks/linux-arm/arm-linux-gnueabihf-gcc-4.9.sh @@ -6,7 +6,7 @@ toolchain="arm-linux-gnueabihf" compiler="gcc-4.9.4-release" cpu="cortex-a15" # armv7 -third_party="libuv,libunwind,openfec,alsa,pulseaudio:10.0,speexdsp,sox,openssl,cpputest" +third_party="libuv,libunwind,openfec,alsa,pulseaudio:10.0,speexdsp,sox,openssl,cpputest,sndfile" scons -Q \ --enable-werror \ diff --git a/scripts/ci_checks/linux-checks/conditional-build.sh b/scripts/ci_checks/linux-checks/conditional-build.sh index e57d4e2971..bbf77882b2 100755 --- a/scripts/ci_checks/linux-checks/conditional-build.sh +++ b/scripts/ci_checks/linux-checks/conditional-build.sh @@ -11,7 +11,8 @@ scons -Q --enable-werror --build-3rdparty=all \ --disable-openfec \ --disable-speex \ --disable-sox \ - --disable-pulseaudio + --disable-pulseaudio \ + --disable-sndfile \ # optional dependencies: none, optional targets: all scons -Q --enable-werror --build-3rdparty=all \ @@ -24,6 +25,7 @@ scons -Q --enable-werror --build-3rdparty=all \ --disable-speex \ --disable-sox \ --disable-pulseaudio \ + --disable-sndfile \ test # optional dependencies: all, optional targets: all diff --git a/scripts/ci_checks/linux-x86_64/alpine.sh b/scripts/ci_checks/linux-x86_64/alpine.sh index e34f99c029..817f85d969 100755 --- a/scripts/ci_checks/linux-x86_64/alpine.sh +++ b/scripts/ci_checks/linux-x86_64/alpine.sh @@ -8,5 +8,5 @@ scons -Q \ --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=openfec,cpputest,google-benchmark \ + --build-3rdparty=openfec,cpputest,google-benchmark,sndfile \ test diff --git a/scripts/ci_checks/linux-x86_64/archlinux.sh b/scripts/ci_checks/linux-x86_64/archlinux.sh index ea88bcf2fa..9a434c4516 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,google-benchmark:1.5.5,sndfile \ test diff --git a/scripts/ci_checks/linux-x86_64/debian.sh b/scripts/ci_checks/linux-x86_64/debian.sh index cda51f1f61..98ff648719 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,cpputest,sndfile \ test diff --git a/scripts/ci_checks/linux-x86_64/fedora.sh b/scripts/ci_checks/linux-x86_64/fedora.sh index aefdd7c6e1..bc4e6bb708 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,cpputest,sndfile \ test diff --git a/scripts/ci_checks/linux-x86_64/opensuse.sh b/scripts/ci_checks/linux-x86_64/opensuse.sh index aefdd7c6e1..bc4e6bb708 100755 --- a/scripts/ci_checks/linux-x86_64/opensuse.sh +++ b/scripts/ci_checks/linux-x86_64/opensuse.sh @@ -8,5 +8,5 @@ scons -Q \ --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=openfec,cpputest \ + --build-3rdparty=openfec,cpputest,sndfile \ test diff --git a/scripts/ci_checks/linux-x86_64/ubuntu-14.04.sh b/scripts/ci_checks/linux-x86_64/ubuntu-14.04.sh index 7a7276bb42..b6b2fe3edc 100755 --- a/scripts/ci_checks/linux-x86_64/ubuntu-14.04.sh +++ b/scripts/ci_checks/linux-x86_64/ubuntu-14.04.sh @@ -9,7 +9,7 @@ do --enable-tests \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=libuv,libatomic_ops,openfec,openssl,pulseaudio,cpputest \ + --build-3rdparty=libuv,libatomic_ops,openfec,openssl,pulseaudio,cpputest,sndfile \ --compiler=${comp} \ test done diff --git a/scripts/ci_checks/linux-x86_64/ubuntu-16.04.sh b/scripts/ci_checks/linux-x86_64/ubuntu-16.04.sh index 9a00deb30e..75dd5c15ad 100755 --- a/scripts/ci_checks/linux-x86_64/ubuntu-16.04.sh +++ b/scripts/ci_checks/linux-x86_64/ubuntu-16.04.sh @@ -10,7 +10,7 @@ do --enable-benchmarks \ --enable-examples \ --enable-doxygen \ - --build-3rdparty=libatomic_ops,openfec,openssl,cpputest,google-benchmark \ + --build-3rdparty=libatomic_ops,openfec,openssl,cpputest,google-benchmark,sndfile \ --compiler=${comp} \ test done 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 081673c30d..a1d0e3e38b 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,google-benchmark,sndfile \ --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 b585fbf9b8..15146816ec 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,sndfile \ --compiler=${comp} \ test done diff --git a/scripts/ci_checks/linux-x86_64/ubuntu-22.04.sh b/scripts/ci_checks/linux-x86_64/ubuntu-22.04.sh index 2715a28190..cf3faa195b 100755 --- a/scripts/ci_checks/linux-x86_64/ubuntu-22.04.sh +++ b/scripts/ci_checks/linux-x86_64/ubuntu-22.04.sh @@ -9,7 +9,7 @@ do --enable-tests \ --enable-benchmarks \ --enable-examples \ - --build-3rdparty=openfec \ + --build-3rdparty=openfec,sndfile \ --compiler=${comp} \ test done diff --git a/scripts/ci_checks/macos/standard-build.sh b/scripts/ci_checks/macos/standard-build.sh index 5660481d9a..b2d6a3bd47 100755 --- a/scripts/ci_checks/macos/standard-build.sh +++ b/scripts/ci_checks/macos/standard-build.sh @@ -5,7 +5,7 @@ set -euxo pipefail brew install \ automake scons ragel gengetopt \ libuv speexdsp sox openssl@3 \ - cpputest google-benchmark + cpputest google-benchmark sndfile # debug build scons -Q \