From 102eea134c038934421e28bf6ad4cc3683c2bb37 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:23:41 +0200 Subject: [PATCH] Fixed CI for debian 10 and 11 4 --- .github/workflows/build_linux_amd64.yml | 4 +++- docker_builds/debian_bullseye/Dockerfile | 2 +- docker_builds/debian_buster/Dockerfile | 2 +- docker_builds/debian_buster/do_build.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index b4719ece..42d5efa9 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -7,7 +7,7 @@ env: BUILD_TYPE: Release jobs: - build_linux: + build_ubuntu: # The CMake configure and build commands are platform agnostic and should work equally # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. @@ -112,6 +112,7 @@ jobs: run: docker run --name build 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 @@ -133,6 +134,7 @@ jobs: run: docker run --name build 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 diff --git a/docker_builds/debian_bullseye/Dockerfile b/docker_builds/debian_bullseye/Dockerfile index a179a08b..213c431e 100644 --- a/docker_builds/debian_bullseye/Dockerfile +++ b/docker_builds/debian_bullseye/Dockerfile @@ -1,3 +1,3 @@ -FROM debian:buster +FROM debian:bullseye COPY do_build.sh /root RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/debian_buster/Dockerfile b/docker_builds/debian_buster/Dockerfile index 213c431e..a179a08b 100644 --- a/docker_builds/debian_buster/Dockerfile +++ b/docker_builds/debian_buster/Dockerfile @@ -1,3 +1,3 @@ -FROM debian:bullseye +FROM debian:buster COPY do_build.sh /root RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index 9e508b7d..90d8107d 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -3,7 +3,7 @@ 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 +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