From 90a8f617e901b9da5e10af39edbbac39be407839 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Thu, 28 Jul 2022 17:33:55 +0200 Subject: [PATCH] Removed deprecated distros and fixed macos CI (hopefully) --- .github/workflows/build_all.yml | 50 +----------------------- docker_builds/ubuntu_hirsute/Dockerfile | 4 -- docker_builds/ubuntu_hirsute/do_build.sh | 25 ------------ docker_builds/ubuntu_impish/Dockerfile | 4 -- docker_builds/ubuntu_impish/do_build.sh | 25 ------------ 5 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 docker_builds/ubuntu_hirsute/Dockerfile delete mode 100644 docker_builds/ubuntu_hirsute/do_build.sh delete mode 100644 docker_builds/ubuntu_impish/Dockerfile delete mode 100644 docker_builds/ubuntu_impish/do_build.sh diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 499bd41a..f4beb6db 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -75,7 +75,7 @@ jobs: path: ${{runner.workspace}}/sdrpp_windows_x64.zip build_macos: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v2 @@ -232,50 +232,6 @@ jobs: name: sdrpp_ubuntu_focal_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - build_ubuntu_hirsute: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_hirsute && docker build . --tag sdrpp_build - - - name: Run Container - run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - - - name: Recover Deb Archive - working-directory: ${{runner.workspace}} - run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ - - - name: Save Deb Archive - uses: actions/upload-artifact@v2 - with: - name: sdrpp_ubuntu_hirsute_amd64 - path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - - build_ubuntu_impish: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_impish && docker build . --tag sdrpp_build - - - name: Run Container - run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - - - name: Recover Deb Archive - working-directory: ${{runner.workspace}} - run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ - - - name: Save Deb Archive - uses: actions/upload-artifact@v2 - with: - name: sdrpp_ubuntu_impish_amd64 - path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - build_ubuntu_jammy: runs-on: ubuntu-latest @@ -326,7 +282,7 @@ jobs: path: ${{runner.workspace}}/sdrpp_debian_armhf.deb create_full_archive: - needs: ['build_windows', 'build_macos', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_sid', 'build_ubuntu_bionic', 'build_ubuntu_focal', 'build_ubuntu_hirsute', 'build_ubuntu_impish', 'build_ubuntu_jammy', 'build_raspios_bullseye_armhf'] + needs: ['build_windows', 'build_macos', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_sid', 'build_ubuntu_bionic', 'build_ubuntu_focal', 'build_ubuntu_jammy', 'build_raspios_bullseye_armhf'] runs-on: ubuntu-latest steps: @@ -343,8 +299,6 @@ jobs: mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && mv sdrpp_ubuntu_bionic_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_bionic_amd64.deb && mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && - mv sdrpp_ubuntu_hirsute_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb && - mv sdrpp_ubuntu_impish_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_impish_amd64.deb && mv sdrpp_ubuntu_jammy_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_jammy_amd64.deb && mv sdrpp_raspios_bullseye_armhf/sdrpp_debian_armhf.deb sdrpp_all/sdrpp_raspios_bullseye_armhf.deb diff --git a/docker_builds/ubuntu_hirsute/Dockerfile b/docker_builds/ubuntu_hirsute/Dockerfile deleted file mode 100644 index 40c340f9..00000000 --- a/docker_builds/ubuntu_hirsute/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:hirsute -ENV DEBIAN_FRONTEND=noninteractive -COPY do_build.sh /root -RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh deleted file mode 100644 index 05a0a32e..00000000 --- a/docker_builds/ubuntu_hirsute/do_build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -cd /root - -# Install dependencies and tools -apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev libzstd-dev libsoapysdr-dev libairspyhf-dev libairspy-dev \ - libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget portaudio19-dev \ - libcodec2-dev - -# Install SDRPlay libraries -wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run -7z x ./SDRplay_RSP_API-Linux-3.07.1.run -7z x ./SDRplay_RSP_API-Linux-3.07.1 -cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so -cp inc/* /usr/include/ - -cd SDRPlusPlus -mkdir build -cd build -cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -make VERBOSE=1 -j2 - -cd .. -sh make_debian_package.sh ./build 'libfftw3-dev, libglfw3-dev, libvolk2-dev, librtaudio-dev, libzstd-dev' \ No newline at end of file diff --git a/docker_builds/ubuntu_impish/Dockerfile b/docker_builds/ubuntu_impish/Dockerfile deleted file mode 100644 index ce52302f..00000000 --- a/docker_builds/ubuntu_impish/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:impish -ENV DEBIAN_FRONTEND=noninteractive -COPY do_build.sh /root -RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_impish/do_build.sh b/docker_builds/ubuntu_impish/do_build.sh deleted file mode 100644 index 05a0a32e..00000000 --- a/docker_builds/ubuntu_impish/do_build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -cd /root - -# Install dependencies and tools -apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev libzstd-dev libsoapysdr-dev libairspyhf-dev libairspy-dev \ - libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget portaudio19-dev \ - libcodec2-dev - -# Install SDRPlay libraries -wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run -7z x ./SDRplay_RSP_API-Linux-3.07.1.run -7z x ./SDRplay_RSP_API-Linux-3.07.1 -cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so -cp inc/* /usr/include/ - -cd SDRPlusPlus -mkdir build -cd build -cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -make VERBOSE=1 -j2 - -cd .. -sh make_debian_package.sh ./build 'libfftw3-dev, libglfw3-dev, libvolk2-dev, librtaudio-dev, libzstd-dev' \ No newline at end of file