Skip to content

Dev/raspberry #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 5, 2022
Merged

Dev/raspberry #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
269f8d0
Raspberry build
d3cker Oct 5, 2022
0b8e46d
added -j3 to make
d3cker Oct 5, 2022
c685fe9
fixed pipeline
d3cker Oct 5, 2022
cc0062a
typo fix
d3cker Oct 5, 2022
3fd6d50
fixing paths
d3cker Oct 5, 2022
52a1273
test rpi64 build and artifacts upload
d3cker Oct 5, 2022
bd8b67a
enabled full pipeline, fixed -j switch for Ubuntu builds
d3cker Oct 5, 2022
364e5d0
fixed path for rpi64 package, updated README
d3cker Oct 5, 2022
cf87b10
another fixed typo. I think i need some validators and tests
d3cker Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 76 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -172,3 +243,5 @@ jobs:
wsjtx-source-code
wsjtx-focal-package
wsjtx-jammy-package
wsjtx-rpi32-package
wsjtx-rpi64-package
78 changes: 77 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -172,3 +246,5 @@ jobs:
wsjtx-source-code
wsjtx-focal-package
wsjtx-jammy-package
wsjtx-rpi32-package
wsjtx-rpi64-package
21 changes: 21 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu_focal/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/ubuntu_jammy/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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