From 36f2a083cef2d37473160ef30264a04db81262a0 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Tue, 16 Jul 2024 20:53:32 +0200 Subject: [PATCH] More work towards working RFNM CI --- .github/workflows/build_all.yml | 6 +++--- docker_builds/debian_bookworm/do_build.sh | 1 + docker_builds/debian_bullseye/do_build.sh | 1 + docker_builds/debian_buster/do_build.sh | 1 + docker_builds/debian_sid/do_build.sh | 1 + docker_builds/ubuntu_bionic/do_build.sh | 1 + docker_builds/ubuntu_focal/do_build.sh | 1 + docker_builds/ubuntu_jammy/do_build.sh | 1 + docker_builds/ubuntu_mantic/do_build.sh | 1 + docker_builds/ubuntu_noble/do_build.sh | 1 + 10 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 674b198d..134f1a27 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -104,7 +104,7 @@ jobs: run: cmake -E make_directory ${{runner.workspace}}/build - name: Install dependencies - run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool && pip3 install mako + run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool spdlog && pip3 install mako - name: Install volk run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ @@ -158,7 +158,7 @@ jobs: run: cmake -E make_directory ${{runner.workspace}}/build - name: Install dependencies - run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool && pip3 install mako --break-system-packages + run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool spdlog && pip3 install mako --break-system-packages - name: Install volk run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ @@ -198,7 +198,7 @@ jobs: - name: Save Archive uses: actions/upload-artifact@v4 - with: + with:- name: sdrpp_macos_arm path: ${{runner.workspace}}/sdrpp_macos_arm.zip diff --git a/docker_builds/debian_bookworm/do_build.sh b/docker_builds/debian_bookworm/do_build.sh index d7272e75..a0fb4b1e 100644 --- a/docker_builds/debian_bookworm/do_build.sh +++ b/docker_builds/debian_bookworm/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh index d7272e75..a0fb4b1e 100644 --- a/docker_builds/debian_bullseye/do_build.sh +++ b/docker_builds/debian_bullseye/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index a799b37f..304db4d0 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh index 73086e2b..681ea497 100644 --- a/docker_builds/debian_sid/do_build.sh +++ b/docker_builds/debian_sid/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index 00241be0..ae8926d8 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -59,6 +59,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. # Fix missing .pc file for codec2 echo 'prefix=/usr/' >> /usr/share/pkgconfig/codec2.pc diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh index d7272e75..a0fb4b1e 100644 --- a/docker_builds/ubuntu_focal/do_build.sh +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/ubuntu_jammy/do_build.sh b/docker_builds/ubuntu_jammy/do_build.sh index d7272e75..a0fb4b1e 100644 --- a/docker_builds/ubuntu_jammy/do_build.sh +++ b/docker_builds/ubuntu_jammy/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/ubuntu_mantic/do_build.sh b/docker_builds/ubuntu_mantic/do_build.sh index 73086e2b..681ea497 100644 --- a/docker_builds/ubuntu_mantic/do_build.sh +++ b/docker_builds/ubuntu_mantic/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build diff --git a/docker_builds/ubuntu_noble/do_build.sh b/docker_builds/ubuntu_noble/do_build.sh index 43d5d207..da0c4ca6 100644 --- a/docker_builds/ubuntu_noble/do_build.sh +++ b/docker_builds/ubuntu_noble/do_build.sh @@ -33,6 +33,7 @@ cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make -j2 make install +cd .. cd SDRPlusPlus mkdir build