Merge pull request #832 from anarkiwi/v33

gr-iqtlabs 1.0.33 (fix for Pi VkFFT), cleanup test install.

.github/workflows/ci-test.yml

@@ -3,7 +3,6 @@ name: CI Test
 on: [push, pull_request]
 
 jobs:
-
   ci-test:
     runs-on: ubuntu-22.04
 
@@ -23,8 +22,25 @@ jobs:
           version: 1.4.2
       - name: Get dependencies
         run: |
-          sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake gcc git g++ gnuradio-dev libev-dev libboost-all-dev libuhd-dev libunwind-dev make pkg-config software-properties-common sox swig uhd-host wget libopencv-dev
-          grep -h 'git clone' docker/*|sed -E 's/RUN\s+git clone\s+//g'|sort|uniq|xargs -L1 git clone
+          sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+            build-essential \
+            cmake \
+            g++ \
+            gcc \
+            git \
+            gnuradio-dev \
+            libboost-all-dev \
+            libev-dev \
+            libopencv-dev \
+            libuhd-dev \
+            libunwind-dev \
+            make \
+            pkg-config \
+            software-properties-common \
+            sox \
+            uhd-host \
+            wget \
+          && grep -h 'git clone' docker/*|sed -E 's/RUN\s+git clone\s+//g'|sort|uniq|xargs -L1 git clone
       - name: Install dependencies
         run: |
           for repodir in flatbuffers json libsigmf gr-iqtlabs ; do \

README-airt.md

@@ -79,7 +79,7 @@ install gr-iqtlabs
 $ git clone https://github.com/google/flatbuffers -b v23.5.26
 $ git clone https://github.com/nlohmann/json -b v3.11.2
 $ git clone https://github.com/deepsig/libsigmf -b v1.0.2
-$ git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.31
+$ git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.33
 $ mkdir -p flatbuffers/build && cd flatbuffers/build && cmake -DCMAKE_INSTALL_PREFIX=~/.conda/envs/$CONDA_DEFAULT_ENV .. && make -j $(nproc) && make install && cd ../..
 $ mkdir -p json/build && cd json/build && cmake -DCMAKE_INSTALL_PREFIX=~/.conda/envs/$CONDA_DEFAULT_ENV .. && make -j $(nproc) && make install && cd ../..
 $ mkdir -p libsigmf/build && cd libsigmf/build && cmake -DUSE_SYSTEM_JSON=ON -DUSE_SYSTEM_FLATBUFFERS=ON -DCMAKE_INSTALL_PREFIX=~/.conda/envs/$CONDA_DEFAULT_ENV -DCMAKE_CXX_FLAGS="-I $HOME/.conda/envs/$CONDA_DEFAULT_ENV/include" .. && make -j $(nproc) && make install && cd ../..

docker/Dockerfile.base

@@ -38,11 +38,12 @@ RUN cmake .. && make -j "$(nproc)"
 FROM iqtlabs/gnuradio:3.10.7 as gr-iqtlabs-builder
 ENV DEBIAN_FRONTEND noninteractive
 WORKDIR /root
-RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.32
+RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.33
+RUN apt-get update && apt-get install -y --no-install-recommends libopencv-dev libvulkan-dev
 WORKDIR /root/gr-iqtlabs/build
 COPY --from=sigmf-builder /usr/local /usr/local
 COPY --from=vkfft-builder /root/VkFFT /root/gr-iqtlabs/VkFFT
-RUN apt-get update && apt-get install -y --no-install-recommends libopencv-dev libvulkan-dev && cmake .. && make -j "$(nproc)" && make install
+RUN cmake .. && make -j "$(nproc)" && make install
 
 FROM iqtlabs/gnuradio:3.10.7 as uhd_sample_recorder-builder
 ENV DEBIAN_FRONTEND noninteractive
@@ -55,15 +56,15 @@ RUN cp uhd_sample_recorder /usr/local/bin
 
 FROM iqtlabs/gnuradio:3.10.7
 ENV DEBIAN_FRONTEND noninteractive
-COPY --from=driver-builder /usr/local /usr/local
-COPY --from=gr-iqtlabs-builder /usr/local /usr/local
-COPY --from=uhd_sample_recorder-builder /usr/local /usr/local
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libopencv-core4.5d \
     libopencv-imgcodecs4.5d \
     libopencv-imgproc4.5d \
     libvulkan1 && \
     apt-get -y -q clean && rm -rf /var/lib/apt/lists/*
+COPY --from=driver-builder /usr/local /usr/local
+COPY --from=gr-iqtlabs-builder /usr/local /usr/local
+COPY --from=uhd_sample_recorder-builder /usr/local /usr/local
 RUN ldconfig -v
 RUN ln -sf /usr/local/lib/python3/dist-packages/* /usr/local/lib/python3.10/dist-packages
 RUN python3 -c "from gnuradio import soapy, iqtlabs"