Fixed CI for debian 10 and 11 4

This commit is contained in:
Ryzerth 2021-04-26 05:23:41 +02:00
parent 1894e191d5
commit 102eea134c
4 changed files with 6 additions and 4 deletions

View File

@ -7,7 +7,7 @@ env:
BUILD_TYPE: Release BUILD_TYPE: Release
jobs: jobs:
build_linux: build_ubuntu:
# The CMake configure and build commands are platform agnostic and should work equally # 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 # well on Windows or Mac. You can convert this to a matrix build if you need
# cross-platform coverage. # cross-platform coverage.
@ -112,6 +112,7 @@ jobs:
run: docker run --name build sdrpp_build /root/do_build.sh run: docker run --name build sdrpp_build /root/do_build.sh
- name: Recover Deb Archive - name: Recover Deb Archive
working-directory: ${{runner.workspace}}
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
- name: Save Deb Archive - name: Save Deb Archive
@ -133,6 +134,7 @@ jobs:
run: docker run --name build sdrpp_build /root/do_build.sh run: docker run --name build sdrpp_build /root/do_build.sh
- name: Recover Deb Archive - name: Recover Deb Archive
working-directory: ${{runner.workspace}}
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
- name: Save Deb Archive - name: Save Deb Archive

View File

@ -1,3 +1,3 @@
FROM debian:buster FROM debian:bullseye
COPY do_build.sh /root COPY do_build.sh /root
RUN chmod +x /root/do_build.sh RUN chmod +x /root/do_build.sh

View File

@ -1,3 +1,3 @@
FROM debian:bullseye FROM debian:buster
COPY do_build.sh /root COPY do_build.sh /root
RUN chmod +x /root/do_build.sh RUN chmod +x /root/do_build.sh

View File

@ -3,7 +3,7 @@ set -e
cd /root cd /root
apt update 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 git clone https://github.com/AlexandreRouma/SDRPlusPlus