From 739e31ad3e56acb4f1d9da87c918b11dc1a17000 Mon Sep 17 00:00:00 2001 From: Bindea Cristian Date: Wed, 18 Sep 2024 14:29:27 +0300 Subject: [PATCH] ci: update libm2k - updated to a branch that contains different fixes Signed-off-by: Bindea Cristian --- ci/armhf/armhf_build_config.sh | 2 +- ci/armhf/local_build_scopy_for_kuiper.sh | 2 +- ci/flatpak/org.adi.Scopy.json.c | 2 +- ci/macOS/macos_config.sh | 2 +- ci/ubuntu/ubuntu_build_process.sh | 2 +- ci/windows/mingw_toolchain.sh | 2 +- ci/x86_64/x86-64_appimage_process.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/armhf/armhf_build_config.sh b/ci/armhf/armhf_build_config.sh index 1f6a48dee..fdf8427f2 100644 --- a/ci/armhf/armhf_build_config.sh +++ b/ci/armhf/armhf_build_config.sh @@ -3,7 +3,7 @@ LIBIIO_VERSION=libiio-v0 LIBAD9361_BRANCH=main GLOG_BRANCH=v0.4.0 -LIBM2K_BRANCH=main +LIBM2K_BRANCH=output_triggers SPDLOG_BRANCH=v1.x VOLK_BRANCH=main GNURADIO_BRANCH=scopy2-maint-3.10 diff --git a/ci/armhf/local_build_scopy_for_kuiper.sh b/ci/armhf/local_build_scopy_for_kuiper.sh index a8cf6d8da..2639ae99f 100755 --- a/ci/armhf/local_build_scopy_for_kuiper.sh +++ b/ci/armhf/local_build_scopy_for_kuiper.sh @@ -9,7 +9,7 @@ JOBS=-j1 USE_STAGING=OFF LIBIIO_VERSION=v0.25 -LIBM2K_BRANCH=master +LIBM2K_BRANCH=output_triggers SPDLOG_BRANCH=v1.x VOLK_BRANCH=main GNURADIO_BRANCH=scopy2-maint-3.10 diff --git a/ci/flatpak/org.adi.Scopy.json.c b/ci/flatpak/org.adi.Scopy.json.c index 2ac0b3834..13b4ac2fb 100644 --- a/ci/flatpak/org.adi.Scopy.json.c +++ b/ci/flatpak/org.adi.Scopy.json.c @@ -393,7 +393,7 @@ { "type": "git", "url": "https://github.com/analogdevicesinc/libm2k", - "commit": "b37bbeb24e159fe975390d72cfd87629b40f352d" + "branch": "output_triggers" } ] }, diff --git a/ci/macOS/macos_config.sh b/ci/macOS/macos_config.sh index 3260ff23f..71dfc720e 100644 --- a/ci/macOS/macos_config.sh +++ b/ci/macOS/macos_config.sh @@ -13,7 +13,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$STAGING_AREA_DEPS;$STAGING_AREA_DEPS/l LIBIIO_VERSION=v0.25 LIBAD9361_BRANCH=main -LIBM2K_BRANCH=main +LIBM2K_BRANCH=output_triggers GNURADIO_BRANCH=scopy2-maint-3.10 GRSCOPY_BRANCH=3.10 GRM2K_BRANCH=main diff --git a/ci/ubuntu/ubuntu_build_process.sh b/ci/ubuntu/ubuntu_build_process.sh index b2881cb65..ebc9f9a2d 100755 --- a/ci/ubuntu/ubuntu_build_process.sh +++ b/ci/ubuntu/ubuntu_build_process.sh @@ -13,7 +13,7 @@ SRC_SCRIPT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) LIBIIO_VERSION=libiio-v0 LIBAD9361_BRANCH=main -LIBM2K_BRANCH=main +LIBM2K_BRANCH=output_triggers SPDLOG_BRANCH=v1.x VOLK_BRANCH=main GNURADIO_BRANCH=scopy2-maint-3.10 diff --git a/ci/windows/mingw_toolchain.sh b/ci/windows/mingw_toolchain.sh index d8a801d4a..ddae43013 100644 --- a/ci/windows/mingw_toolchain.sh +++ b/ci/windows/mingw_toolchain.sh @@ -9,7 +9,7 @@ BUILD_STATUS_FILE=$HOME/scopy-mingw-build-status LIBSERIALPORT_BRANCH=scopy-v2 LIBIIO_VERSION=libiio-v0 LIBAD9361_BRANCH=main -LIBM2K_BRANCH=main +LIBM2K_BRANCH=output_triggers SPDLOG_BRANCH=v1.x LIBSNDFILE_BRANCH=1.2.2 VOLK_BRANCH=main diff --git a/ci/x86_64/x86-64_appimage_process.sh b/ci/x86_64/x86-64_appimage_process.sh index 8eab1000c..81589f189 100755 --- a/ci/x86_64/x86-64_appimage_process.sh +++ b/ci/x86_64/x86-64_appimage_process.sh @@ -18,7 +18,7 @@ export APPIMAGE=1 LIBIIO_VERSION=libiio-v0 LIBAD9361_BRANCH=main -LIBM2K_BRANCH=main +LIBM2K_BRANCH=output_triggers SPDLOG_BRANCH=v1.x VOLK_BRANCH=main GNURADIO_BRANCH=scopy2-maint-3.10