Dev/raspberry (#3)

* Raspberry build
d3cker · Oct 5, 2022 · 9329e03 · 9329e03
1 parent f8d48bb
commit 9329e03
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,6 +59,59 @@ jobs:
           name: wsjtx-patched-code
           path: unpack/wsjtx-patched-2.5.4.tgz
 
+  build_rpi32:
+    needs: ['patch_source']
+    runs-on: ARM
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: wsjtx-patched-code
+
+      - name: Prepare environment
+        run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build
+
+      - 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
+
+      - name: Upload new patched archive
+        uses: actions/upload-artifact@v2
+        with:
+          name: wsjtx-rpi32-package
+          path: build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_armhf.deb
+
+  build_rpi64:
+    needs: ['patch_source']
+    runs-on: ARM64
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: wsjtx-patched-code
+
+      - name: Prepare environment
+        run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build
+
+      - 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
+
+      - name: Upload new patched archive
+        uses: actions/upload-artifact@v2
+        with:
+          name: wsjtx-rpi64-package
+          path: build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_arm64.deb
 
   build_focal:
     needs: ['patch_source']
@@ -108,9 +161,8 @@ jobs:
           name: wsjtx-jammy-package
           path: wsjtx_2.5.4_jammy_amd64.deb
 
-
   release_draft:
-    needs: ['build_focal' , 'build_jammy']
+    needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64']
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
@@ -149,6 +201,26 @@ jobs:
           asset_name: wsjtx_2.5.4_jammy_amd64.deb
           asset_content_type: application/gzip
 
+      - name: upload rpi32 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-rpi32-package/wsjtx_2.5.4_armhf.deb
+          asset_name: wsjtx_2.5.4_armhf.deb
+          asset_content_type: application/gzip
+
+      - name: upload rpi64 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-rpi64-package/wsjtx_2.5.4_arm64.deb
+          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:
@@ -159,7 +231,6 @@ jobs:
           asset_name: wsjtx-patched-2.5.4.tgz
           asset_content_type: application/gzip
 
-
   clean_artifacts:
     needs: ['release_draft']
     runs-on: ubuntu-latest
@@ -172,3 +243,5 @@ jobs:
             wsjtx-source-code
             wsjtx-focal-package
             wsjtx-jammy-package
+            wsjtx-rpi32-package
+            wsjtx-rpi64-package
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,6 +59,59 @@ jobs:
           name: wsjtx-patched-code
           path: unpack/wsjtx-patched-2.5.4.tgz
 
+  build_rpi32:
+    needs: ['patch_source']
+    runs-on: ARM
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: wsjtx-patched-code
+
+      - name: Prepare environment
+        run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build
+
+      - 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
+
+      - name: Upload new patched archive
+        uses: actions/upload-artifact@v2
+        with:
+          name: wsjtx-rpi32-package
+          path: build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_armhf.deb
+
+  build_rpi64:
+    needs: ['patch_source']
+    runs-on: ARM64
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: wsjtx-patched-code
+
+      - name: Prepare environment
+        run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build
+
+      - 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
+
+      - name: Upload new patched archive
+        uses: actions/upload-artifact@v2
+        with:
+          name: wsjtx-rpi64-package
+          path: build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_arm64.deb
 
   build_focal:
     needs: ['patch_source']
@@ -110,7 +163,7 @@ jobs:
 
 
   release_draft:
-    needs: ['build_focal' , 'build_jammy']
+    needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64']
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
@@ -149,6 +202,27 @@ jobs:
           asset_name: wsjtx_2.5.4_jammy_amd64.deb
           asset_content_type: application/gzip
 
+      - name: upload rpi32 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-rpi32-package/wsjtx_2.5.4_armhf.deb
+          asset_name: wsjtx_2.5.4_armhf.deb
+          asset_content_type: application/gzip
+
+      - name: upload rpi64 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-rpi64-package/wsjtx_2.5.4_arm64.deb
+          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:
@@ -172,3 +246,5 @@ jobs:
             wsjtx-source-code
             wsjtx-focal-package
             wsjtx-jammy-package
+            wsjtx-rpi32-package
+            wsjtx-rpi64-package
diff --git a/README.md b/README.md
@@ -7,12 +7,33 @@ 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
+- ARM (Raspbian) 64bit
+- 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.
 
+Short version for Ubuntu/Raspbian build:
+- Install dependencies
+```
+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
+```
+
+- Build package
+```
+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
+```
+
 ## Features
 - Added option: Setup -> RX/TX Macros -> RX regex ignore filter
 ![Options](images/options.png)

diff --git a/docker/ubuntu_focal/build.sh b/docker/ubuntu_focal/build.sh
@@ -4,6 +4,6 @@ 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
+cmake --build . --target package -- -j2
 
 cp /build/build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_amd64.deb /build/wsjtx_2.5.4_focal_amd64.deb
diff --git a/docker/ubuntu_jammy/build.sh b/docker/ubuntu_jammy/build.sh
@@ -4,6 +4,6 @@ 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 -- -j12
+cmake --build . --target package -- -j2
 
 cp /build/build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_amd64.deb /build/wsjtx_2.5.4_jammy_amd64.deb