diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index a45193c7..b4719ece 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -99,17 +99,17 @@ jobs: name: sdrpp_windows_x64 path: ${{runner.workspace}}/sdrpp_windows_x64.zip - build_debian10: + build_debian_buster: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker_builds/debian10 && docker build . --tag sdrpp_build + run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build -it sdrpp_build /root/do_build.sh + run: docker run --name build sdrpp_build /root/do_build.sh - name: Recover Deb Archive run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ @@ -117,20 +117,20 @@ jobs: - name: Save Deb Archive uses: actions/upload-artifact@v2 with: - name: sdrpp_debian10_amd64 + name: sdrpp_debian_buster_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - build_debian11: + build_debian_bullseye: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker_builds/debian11 && docker build . --tag sdrpp_build + run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build -it sdrpp_build /root/do_build.sh + run: docker run --name build sdrpp_build /root/do_build.sh - name: Recover Deb Archive run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ @@ -138,5 +138,5 @@ jobs: - name: Save Deb Archive uses: actions/upload-artifact@v2 with: - name: sdrpp_debian11_amd64 + name: sdrpp_debian_bullseye_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb \ No newline at end of file diff --git a/docker_builds/debian10/Dockerfile b/docker_builds/debian10/Dockerfile deleted file mode 100644 index 07f7b8e0..00000000 --- a/docker_builds/debian10/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM debian:10 -COPY do_build.sh /root \ No newline at end of file diff --git a/docker_builds/debian10/do_build.sh b/docker_builds/debian10/do_build.sh deleted file mode 100644 index 90d8107d..00000000 --- a/docker_builds/debian10/do_build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e -cd /root - -apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev - -git clone https://github.com/AlexandreRouma/SDRPlusPlus - -cd SDRPlusPlus -mkdir build -cd build -cmake .. -make -j2 - -cd .. -sh make_debian_package.sh ./build \ No newline at end of file diff --git a/docker_builds/debian11/Dockerfile b/docker_builds/debian11/Dockerfile deleted file mode 100644 index 3cf088da..00000000 --- a/docker_builds/debian11/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM debian:11 -COPY do_build.sh /root \ No newline at end of file diff --git a/docker_builds/debian11/do_build.sh b/docker_builds/debian11/do_build.sh deleted file mode 100644 index 9e508b7d..00000000 --- a/docker_builds/debian11/do_build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e -cd /root - -apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev - -git clone https://github.com/AlexandreRouma/SDRPlusPlus - -cd SDRPlusPlus -mkdir build -cd build -cmake .. -make -j2 - -cd .. -sh make_debian_package.sh ./build \ No newline at end of file