diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index e3a180e6..14798ff5 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -343,14 +343,14 @@ jobs: name: sdrpp_ubuntu_jammy_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - build_ubuntu_mantic: + build_ubuntu_oracular: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_mantic && docker build . --tag sdrpp_build + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_oracular && 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 @@ -362,7 +362,7 @@ jobs: - name: Save Deb Archive uses: actions/upload-artifact@v4 with: - name: sdrpp_ubuntu_mantic_amd64 + name: sdrpp_ubuntu_oracular_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb build_ubuntu_noble: @@ -387,6 +387,28 @@ jobs: name: sdrpp_ubuntu_noble_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_oracular: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_oracular && 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@v4 + with: + name: sdrpp_ubuntu_oracular_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_raspios_bullseye_armhf: runs-on: ARM @@ -442,7 +464,7 @@ jobs: path: ${{runner.workspace}}/sdrpp.apk create_full_archive: - needs: ['build_windows', 'build_macos_intel', 'build_macos_arm', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_bookworm', 'build_debian_sid', 'build_ubuntu_focal', 'build_ubuntu_jammy', 'build_ubuntu_mantic', 'build_ubuntu_noble', 'build_raspios_bullseye_armhf', 'build_android'] + needs: ['build_windows', 'build_macos_intel', 'build_macos_arm', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_bookworm', 'build_debian_sid', 'build_ubuntu_focal', 'build_ubuntu_jammy', 'build_ubuntu_noble', 'build_ubuntu_oracular', 'build_raspios_bullseye_armhf', 'build_android'] runs-on: ubuntu-latest steps: @@ -461,8 +483,8 @@ jobs: mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && mv sdrpp_ubuntu_jammy_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_jammy_amd64.deb && - mv sdrpp_ubuntu_mantic_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_mantic_amd64.deb && mv sdrpp_ubuntu_noble_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_noble_amd64.deb && + mv sdrpp_ubuntu_oracular_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_oracular_amd64.deb && mv sdrpp_raspios_bullseye_armhf/sdrpp_debian_armhf.deb sdrpp_all/sdrpp_raspios_bullseye_armhf.deb && mv sdrpp_android/sdrpp.apk sdrpp_all/sdrpp.apk diff --git a/docker_builds/ubuntu_mantic/Dockerfile b/docker_builds/ubuntu_oracular/Dockerfile similarity index 80% rename from docker_builds/ubuntu_mantic/Dockerfile rename to docker_builds/ubuntu_oracular/Dockerfile index 629e263e..a53852e5 100644 --- a/docker_builds/ubuntu_mantic/Dockerfile +++ b/docker_builds/ubuntu_oracular/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:mantic +FROM ubuntu:oracular 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_mantic/do_build.sh b/docker_builds/ubuntu_oracular/do_build.sh similarity index 100% rename from docker_builds/ubuntu_mantic/do_build.sh rename to docker_builds/ubuntu_oracular/do_build.sh