From da5c8d7c6f949b621096274474b278c18272f05e Mon Sep 17 00:00:00 2001 From: d3cker Date: Thu, 6 Oct 2022 13:17:10 +0200 Subject: [PATCH 1/4] add Debian Buster, Debian Bullseye and Fedora 36 packages --- .github/workflows/build.yml | 111 +++++++++++++++++++++++++++++- .github/workflows/release.yml | 111 ++++++++++++++++++++++++++++-- README.md | 34 ++++++--- docker/debian_bullseye/Dockerfile | 8 +++ docker/debian_bullseye/build.sh | 9 +++ docker/debian_buster/Dockerfile | 11 +++ docker/debian_buster/build.sh | 9 +++ docker/feodra_36/Dockerfile | 5 ++ docker/feodra_36/build.sh | 9 +++ 9 files changed, 290 insertions(+), 17 deletions(-) create mode 100644 docker/debian_bullseye/Dockerfile create mode 100755 docker/debian_bullseye/build.sh create mode 100644 docker/debian_buster/Dockerfile create mode 100755 docker/debian_buster/build.sh create mode 100644 docker/feodra_36/Dockerfile create mode 100755 docker/feodra_36/build.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b5e1ba..fd22304 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: - name: Prepare Makefile run: cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - + - name: Compile binaray and create package run: cd build && cmake --build . --target package -- -j3 @@ -103,7 +103,7 @@ jobs: - name: Prepare Makefile run: cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - + - name: Compile binaray and create package run: cd build && cmake --build . --target package -- -j3 @@ -161,8 +161,80 @@ jobs: name: wsjtx-jammy-package path: wsjtx_2.5.4_jammy_amd64.deb + build_buster: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/debian_buster && docker build . --tag debian_buster_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_buster_build /build/docker/debian_buster/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-buster-package + path: wsjtx_2.5.4_buster_amd64.deb + + build_bullseye: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/debian_bullseye && docker build . --tag debian_bullseye_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_bullseye_build /build/docker/debian_bullseye/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-bullseye-package + path: wsjtx_2.5.4_bullseye_amd64.deb + + build_fedora36: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/fedora_36 && docker build . --tag fedora_36_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build fedora_36_build /build/docker/fedora_36/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-fedora36-package + path: wsjtx-2.5.4.fc36.x86_64.rpm + release_draft: - needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64'] + needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64' , 'build_buster' , 'build_bullseye' , 'build_feodra36'] runs-on: ubuntu-latest steps: - name: Download artifacts @@ -201,6 +273,36 @@ jobs: asset_name: wsjtx_2.5.4_jammy_amd64.deb asset_content_type: application/gzip + - name: upload buster artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-buster-package/wsjtx_2.5.4_buster_amd64.deb + asset_name: wsjtx_2.5.4_buster_amd64.deb + asset_content_type: application/gzip + + - name: upload bullseye artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-bullseye-package/wsjtx_2.5.4_bullseye_amd64.deb + asset_name: wsjtx_2.5.4_bullseye_amd64.deb + asset_content_type: application/gzip + + - name: upload fedora36 artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-fedora36-package/wsjtx-2.5.4.fc36.x86_64.rpm + asset_name: wsjtx-2.5.4.fc36.x86_64.rpm + asset_content_type: application/gzip + - name: upload rpi32 artifact uses: actions/upload-release-asset@v1 env: @@ -243,5 +345,8 @@ jobs: wsjtx-source-code wsjtx-focal-package wsjtx-jammy-package + wsjtx-buster-package + wsjtx-bullseye-package + wsjtx-fedora36-package wsjtx-rpi32-package wsjtx-rpi64-package diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4975606..69da1ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,7 +76,7 @@ jobs: - name: Prepare Makefile run: cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - + - name: Compile binaray and create package run: cd build && cmake --build . --target package -- -j3 @@ -103,7 +103,7 @@ jobs: - name: Prepare Makefile run: cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - + - name: Compile binaray and create package run: cd build && cmake --build . --target package -- -j3 @@ -161,9 +161,80 @@ jobs: name: wsjtx-jammy-package path: wsjtx_2.5.4_jammy_amd64.deb + build_buster: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/debian_buster && docker build . --tag debian_buster_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_buster_build /build/docker/debian_buster/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-buster-package + path: wsjtx_2.5.4_buster_amd64.deb + + build_bullseye: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/debian_bullseye && docker build . --tag debian_bullseye_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build debian_bullseye_build /build/docker/debian_bullseye/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-bullseye-package + path: wsjtx_2.5.4_bullseye_amd64.deb + + build_fedora36: + needs: ['patch_source'] + runs-on: ubuntu-latest + steps: + - name: Get source code + uses: actions/checkout@v2 + + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + name: wsjtx-patched-code + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker/fedora_36 && docker build . --tag fedora_36_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build fedora_36_build /build/docker/fedora_36/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-fedora36-package + path: wsjtx-2.5.4.fc36.x86_64.rpm release_draft: - needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64'] + needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64' , 'build_buster' , 'build_bullseye' , 'build_fedora36'] runs-on: ubuntu-latest steps: - name: Download artifacts @@ -202,6 +273,36 @@ jobs: asset_name: wsjtx_2.5.4_jammy_amd64.deb asset_content_type: application/gzip + - name: upload buster artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-buster-package/wsjtx_2.5.4_buster_amd64.deb + asset_name: wsjtx_2.5.4_buster_amd64.deb + asset_content_type: application/gzip + + - name: upload bullseye artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-bullseye-package/wsjtx_2.5.4_bullseye_amd64.deb + asset_name: wsjtx_2.5.4_bullseye_amd64.deb + asset_content_type: application/gzip + + - name: upload fedora36 artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-fedora36-package/wsjtx-2.5.4.fc36.x86_64.rpm + asset_name: wsjtx-2.5.4.fc36.x86_64.rpm + asset_content_type: application/gzip + - name: upload rpi32 artifact uses: actions/upload-release-asset@v1 env: @@ -222,7 +323,6 @@ jobs: asset_name: wsjtx_2.5.4_arm64.deb asset_content_type: application/gzip - - name: upload patched source code uses: actions/upload-release-asset@v1 env: @@ -246,5 +346,8 @@ jobs: wsjtx-source-code wsjtx-focal-package wsjtx-jammy-package + wsjtx-buster-package + wsjtx-bullseye-package + wsjtx-fedora36-package wsjtx-rpi32-package wsjtx-rpi64-package diff --git a/README.md b/README.md index 33b63e8..afe3a61 100644 --- a/README.md +++ b/README.md @@ -7,23 +7,35 @@ Navigate to [GitHub Actions](https://github.com/d3cker/wsjtx-regex-filter/action [Available releases](https://github.com/d3cker/wsjtx-regex-filter/releases): - Ubuntu Focal 20.04 - Ubuntu Jammy 22.04 +- Debian Buster 10 +- Debian Bullseye 11 +- Fedora 36 - ARM (Raspbian) 64bit -- ARM (Raspbian) 32bit -- Patched source code tgz archive +- ARM (Raspbian) 32bit +- Patched source code .tgz archive -If you want to compile this patch by your own, just grab patched source code from -[Releases](https://github.com/d3cker/wsjtx-regex-filter/releases) page and follow -original INSTALL instructions. +You may need to remove `wsjtx`, `wsjtx-doc` and `wsjtx-data` before installing +a release package. -Short version for Ubuntu/Raspbian build: -- Install dependencies +If you want to compile this patch by your own try this instructions: + +- Install dependencies (Ubuntu/Debian/Raspbian) ``` sudo apt-get update sudo apt-get install -y gcc g++ clang gfortran cmake git asciidoc texinfo\ -qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools\ -libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev\ -portaudio19-dev build-essential binutils lintian debhelper dh-make devscripts + qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools\ + libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev\ + portaudio19-dev build-essential binutils lintian debhelper dh-make devscripts +``` + +- Install dependencies (Fedora) ``` +sudo dnf install libgfortran fftw-libs-single qt5-qtbase\ + qt5-qtmultimedia qt5-qtserialport qt5-qtsvg\ + qt5-qtserialport libgomp boost libusbx portaudio +``` + +- Download `wsjtx-patched-2.5.4.tgz` from [Releases](https://github.com/d3cker/wsjtx-regex-filter/releases) - Build package ``` @@ -34,6 +46,8 @@ cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 cmake --build . --target package ``` +You may add `-- -j` to speed up build process. + ## Features - Added option: Setup -> RX/TX Macros -> RX regex ignore filter ![Options](images/options.png) diff --git a/docker/debian_bullseye/Dockerfile b/docker/debian_bullseye/Dockerfile new file mode 100644 index 0000000..ad95483 --- /dev/null +++ b/docker/debian_bullseye/Dockerfile @@ -0,0 +1,8 @@ +FROM debian:11 + +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y gcc\ + g++ clang gfortran cmake git asciidoc texinfo qtmultimedia5-dev\ + libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev\ + libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev\ + build-essential binutils lintian debhelper dh-make devscripts + diff --git a/docker/debian_bullseye/build.sh b/docker/debian_bullseye/build.sh new file mode 100755 index 0000000..cf10524 --- /dev/null +++ b/docker/debian_bullseye/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +tar -xzvf wsjtx-patched-2.5.4.tgz +mkdir build +cd build +cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 +cmake --build . --target package -- -j2 + +cp /build/build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_amd64.deb /build/wsjtx_2.5.4_bullseye_amd64.deb diff --git a/docker/debian_buster/Dockerfile b/docker/debian_buster/Dockerfile new file mode 100644 index 0000000..0951b9e --- /dev/null +++ b/docker/debian_buster/Dockerfile @@ -0,0 +1,11 @@ +FROM fedora:36 + +RUN dnf install -y qt5-qtmultimedia-devel qt5-qtserialport-devel qt5-linguist\ + boost-devel fftw-devel readline-devel systemd-devel libusb-devel\ + portaudio-devel patch gcc g++ gfortran cmake git asciidoc texinfo\ + rpmdevtools rpmlint + + + + + diff --git a/docker/debian_buster/build.sh b/docker/debian_buster/build.sh new file mode 100755 index 0000000..589f6ca --- /dev/null +++ b/docker/debian_buster/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +tar -xzvf wsjtx-patched-2.5.4.tgz +mkdir build +cd build +cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 +cmake --build . --target package -- -j2 + +cp /build/build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_amd64.deb /build/wsjtx_2.5.4_buster_amd64.deb diff --git a/docker/feodra_36/Dockerfile b/docker/feodra_36/Dockerfile new file mode 100644 index 0000000..3cf155a --- /dev/null +++ b/docker/feodra_36/Dockerfile @@ -0,0 +1,5 @@ +FROM fedora:36 + +RUN sudo dnf install libgfortran fftw-libs-single qt5-qtbase \ + qt5-qtmultimedia qt5-qtserialport qt5-qtsvg \ + qt5-qtserialport libgomp boost libusbx portaudio diff --git a/docker/feodra_36/build.sh b/docker/feodra_36/build.sh new file mode 100755 index 0000000..08cc129 --- /dev/null +++ b/docker/feodra_36/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +tar -xzvf wsjtx-patched-2.5.4.tgz +mkdir build +cd build +cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 +cmake --build . --target package -- -j2 + +cp /build/build/wsjtx-prefix/src/wsjtx-build/wsjtx-2.5.4.x86_64.rpm /build/wsjtx-2.5.4.fc36.x86_64.rpm From ffdfb033f23643b9c26352786c4c08a707f4580d Mon Sep 17 00:00:00 2001 From: d3cker Date: Thu, 6 Oct 2022 13:18:37 +0200 Subject: [PATCH 2/4] typo fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd22304..df55b3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -234,7 +234,7 @@ jobs: path: wsjtx-2.5.4.fc36.x86_64.rpm release_draft: - needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64' , 'build_buster' , 'build_bullseye' , 'build_feodra36'] + needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64' , 'build_buster' , 'build_bullseye' , 'build_fedora36'] runs-on: ubuntu-latest steps: - name: Download artifacts From 7da7e1e1135e48e271a8301ded1f7f2dd93d504a Mon Sep 17 00:00:00 2001 From: d3cker Date: Thu, 6 Oct 2022 13:21:10 +0200 Subject: [PATCH 3/4] path fix --- docker/{feodra_36 => fedora_36}/Dockerfile | 0 docker/{feodra_36 => fedora_36}/build.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docker/{feodra_36 => fedora_36}/Dockerfile (100%) rename docker/{feodra_36 => fedora_36}/build.sh (100%) diff --git a/docker/feodra_36/Dockerfile b/docker/fedora_36/Dockerfile similarity index 100% rename from docker/feodra_36/Dockerfile rename to docker/fedora_36/Dockerfile diff --git a/docker/feodra_36/build.sh b/docker/fedora_36/build.sh similarity index 100% rename from docker/feodra_36/build.sh rename to docker/fedora_36/build.sh From c03679c4dcd02cfc6188a576753b07069b52b430 Mon Sep 17 00:00:00 2001 From: d3cker Date: Thu, 6 Oct 2022 13:28:29 +0200 Subject: [PATCH 4/4] Added Debian 10, Debian 11, Feodra 36 --- docker/debian_buster/Dockerfile | 15 ++++++--------- docker/fedora_36/Dockerfile | 12 +++++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/docker/debian_buster/Dockerfile b/docker/debian_buster/Dockerfile index 0951b9e..1323851 100644 --- a/docker/debian_buster/Dockerfile +++ b/docker/debian_buster/Dockerfile @@ -1,11 +1,8 @@ -FROM fedora:36 - -RUN dnf install -y qt5-qtmultimedia-devel qt5-qtserialport-devel qt5-linguist\ - boost-devel fftw-devel readline-devel systemd-devel libusb-devel\ - portaudio-devel patch gcc g++ gfortran cmake git asciidoc texinfo\ - rpmdevtools rpmlint - - - +FROM debian:10 +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y gcc\ + g++ clang gfortran cmake git asciidoc texinfo qtmultimedia5-dev\ + libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev\ + libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev\ + build-essential binutils lintian debhelper dh-make devscripts diff --git a/docker/fedora_36/Dockerfile b/docker/fedora_36/Dockerfile index 3cf155a..0951b9e 100644 --- a/docker/fedora_36/Dockerfile +++ b/docker/fedora_36/Dockerfile @@ -1,5 +1,11 @@ FROM fedora:36 -RUN sudo dnf install libgfortran fftw-libs-single qt5-qtbase \ - qt5-qtmultimedia qt5-qtserialport qt5-qtsvg \ - qt5-qtserialport libgomp boost libusbx portaudio +RUN dnf install -y qt5-qtmultimedia-devel qt5-qtserialport-devel qt5-linguist\ + boost-devel fftw-devel readline-devel systemd-devel libusb-devel\ + portaudio-devel patch gcc g++ gfortran cmake git asciidoc texinfo\ + rpmdevtools rpmlint + + + + +