From 269f8d073d0a64a78947e5b288ca6828bb6ca105 Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:03:02 +0200 Subject: [PATCH 1/9] Raspberry build --- .github/workflows/build.yml | 213 ++++++++++++++++++++---------------- 1 file changed, 120 insertions(+), 93 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f72a11..b904d96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,34 +59,9 @@ jobs: name: wsjtx-patched-code path: unpack/wsjtx-patched-2.5.4.tgz - - build_focal: - 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/ubuntu_focal && docker build . --tag ubuntu_focal_build - - - name: Run Container - run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_focal_build /build/docker/ubuntu_focal/build.sh - - - name: Upload new patched archive - uses: actions/upload-artifact@v2 - with: - name: wsjtx-focal-package - path: wsjtx_2.5.4_focal_amd64.deb - - build_jammy: - needs: ['patch_source'] - runs-on: ubuntu-latest + build_rpi32: + needs: ['patched_source'] + runs-on: ARM steps: - name: Get source code uses: actions/checkout@v2 @@ -96,69 +71,121 @@ jobs: with: name: wsjtx-patched-code - - name: Create Docker Image - run: cd $GITHUB_WORKSPACE/docker/ubuntu_jammy && docker build . --tag ubuntu_jammy_build - - - name: Run Container - run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_jammy_build /build/docker/ubuntu_jammy/build.sh - - - name: Upload new patched archive - uses: actions/upload-artifact@v2 - with: - name: wsjtx-jammy-package - path: wsjtx_2.5.4_jammy_amd64.deb - - - release_draft: - needs: ['build_focal' , 'build_jammy'] - runs-on: ubuntu-latest - steps: - - name: Download artifacts - uses: actions/download-artifact@v2 - - - name: Release draft - uses: actions/create-release@v1 - id: create_release_draft - with: - draft: true - prerelease: true - release_name: Development build ${{ github.run_number }} - tag_name: ${{ github.ref }} - body: | - Automatic build on push. This is not a release. - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: upload focal 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-focal-package/wsjtx_2.5.4_focal_amd64.deb - asset_name: wsjtx_2.5.4_focal_amd64.deb - asset_content_type: application/gzip - - - name: upload jammy 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-jammy-package/wsjtx_2.5.4_jammy_amd64.deb - asset_name: wsjtx_2.5.4_jammy_amd64.deb - asset_content_type: application/gzip - - - name: upload patched source code - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.create_release_draft.outputs.upload_url }} - asset_path: wsjtx-patched-code/wsjtx-patched-2.5.4.tgz - asset_name: wsjtx-patched-2.5.4.tgz - asset_content_type: application/gzip - + - name: Prepare environment + run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build && cd build + + - name: Prepare Makefile + run: cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 + + - name: Compile binaray and create package + run: cmake --build . --target package + +# - name: Upload new patched archive +# uses: actions/upload-artifact@v2 +# with: +# name: wsjtx-focal-package +# path: wsjtx_2.5.4_focal_amd64.deb + + +# build_focal: +# 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/ubuntu_focal && docker build . --tag ubuntu_focal_build +# +# - name: Run Container +# run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_focal_build /build/docker/ubuntu_focal/build.sh +# +# - name: Upload new patched archive +# uses: actions/upload-artifact@v2 +# with: +# name: wsjtx-focal-package +# path: wsjtx_2.5.4_focal_amd64.deb +# +# build_jammy: +# 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/ubuntu_jammy && docker build . --tag ubuntu_jammy_build +# +# - name: Run Container +# run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_jammy_build /build/docker/ubuntu_jammy/build.sh +# +# - name: Upload new patched archive +# uses: actions/upload-artifact@v2 +# with: +# name: wsjtx-jammy-package +# path: wsjtx_2.5.4_jammy_amd64.deb +# + +# release_draft: +# needs: ['build_focal' , 'build_jammy'] +# runs-on: ubuntu-latest +# steps: +# - name: Download artifacts +# uses: actions/download-artifact@v2 +# +# - name: Release draft +# uses: actions/create-release@v1 +# id: create_release_draft +# with: +# draft: true +# prerelease: true +# release_name: Development build ${{ github.run_number }} +# tag_name: ${{ github.ref }} +# body: | +# Automatic build on push. This is not a release. +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: upload focal 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-focal-package/wsjtx_2.5.4_focal_amd64.deb +# asset_name: wsjtx_2.5.4_focal_amd64.deb +# asset_content_type: application/gzip +# +# - name: upload jammy 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-jammy-package/wsjtx_2.5.4_jammy_amd64.deb +# asset_name: wsjtx_2.5.4_jammy_amd64.deb +# asset_content_type: application/gzip +# +# - name: upload patched source code +# uses: actions/upload-release-asset@v1 +# env: +# GITHUB_TOKEN: ${{ github.token }} +# with: +# upload_url: ${{ steps.create_release_draft.outputs.upload_url }} +# asset_path: wsjtx-patched-code/wsjtx-patched-2.5.4.tgz +# asset_name: wsjtx-patched-2.5.4.tgz +# asset_content_type: application/gzip +# clean_artifacts: needs: ['release_draft'] @@ -170,5 +197,5 @@ jobs: name: | wsjtx-patched-code wsjtx-source-code - wsjtx-focal-package - wsjtx-jammy-package +# wsjtx-focal-package +# wsjtx-jammy-package From 0b8e46db39de939056453c69cc60afc6715c94cb Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:04:47 +0200 Subject: [PATCH 2/9] added -j3 to make --- .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 b904d96..a35e3d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,7 @@ jobs: run: cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - name: Compile binaray and create package - run: cmake --build . --target package + run: cmake --build . --target package -- -j3 # - name: Upload new patched archive # uses: actions/upload-artifact@v2 From c685fe996a80ed6a7faadb8e09f6d1d6c3603601 Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:07:39 +0200 Subject: [PATCH 3/9] fixed pipeline --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a35e3d6..fa53588 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,15 +187,15 @@ jobs: # asset_content_type: application/gzip # - clean_artifacts: - needs: ['release_draft'] - runs-on: ubuntu-latest - steps: - - name: Delete Artifact - uses: GeekyEggo/delete-artifact@v1.0.0 - with: - name: | - wsjtx-patched-code - wsjtx-source-code +# clean_artifacts: +# needs: ['release_draft'] +# runs-on: ubuntu-latest +# steps: +# - name: Delete Artifact +# uses: GeekyEggo/delete-artifact@v1.0.0 +# with: +# name: | +# wsjtx-patched-code +# wsjtx-source-code # wsjtx-focal-package # wsjtx-jammy-package From cc0062a0909eaf426cc8b42e9ef99fb5106ed6b8 Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:08:18 +0200 Subject: [PATCH 4/9] 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 fa53588..5574938 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: path: unpack/wsjtx-patched-2.5.4.tgz build_rpi32: - needs: ['patched_source'] + needs: ['patch_source'] runs-on: ARM steps: - name: Get source code From 3fd6d502a28af8f7cd29e5da80a99f11b239cdff Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:12:42 +0200 Subject: [PATCH 5/9] fixing paths --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5574938..75ad1c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,13 +72,13 @@ jobs: name: wsjtx-patched-code - name: Prepare environment - run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build && cd build + run: tar -xzvf wsjtx-patched-2.5.4.tgz && mkdir build - name: Prepare Makefile - run: cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 + run: cd build && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF ../wsjtx-2.5.4 - name: Compile binaray and create package - run: cmake --build . --target package -- -j3 + run: cd build && cmake --build . --target package -- -j3 # - name: Upload new patched archive # uses: actions/upload-artifact@v2 From 52a127335342892030e3eb9e35058e1a81e9b3f9 Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 12:47:14 +0200 Subject: [PATCH 6/9] test rpi64 build and artifacts upload --- .github/workflows/build.yml | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75ad1c0..1218936 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,11 +80,38 @@ jobs: - 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-focal-package -# path: wsjtx_2.5.4_focal_amd64.deb + - 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: From bd8b67a479d71c0f5f209c74b6107f4de81bc2be Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 13:14:59 +0200 Subject: [PATCH 7/9] enabled full pipeline, fixed -j switch for Ubuntu builds --- .github/workflows/build.yml | 243 ++++++++++++++++++---------------- .github/workflows/release.yml | 78 ++++++++++- docker/ubuntu_focal/build.sh | 2 +- docker/ubuntu_jammy/build.sh | 2 +- 4 files changed, 210 insertions(+), 115 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1218936..e79c86e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,116 +113,135 @@ jobs: name: wsjtx-rpi64-package path: build/wsjtx-prefix/src/wsjtx-build/wsjtx_2.5.4_arm64.deb + build_focal: + 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/ubuntu_focal && docker build . --tag ubuntu_focal_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_focal_build /build/docker/ubuntu_focal/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-focal-package + path: wsjtx_2.5.4_focal_amd64.deb + + build_jammy: + 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/ubuntu_jammy && docker build . --tag ubuntu_jammy_build + + - name: Run Container + run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_jammy_build /build/docker/ubuntu_jammy/build.sh + + - name: Upload new patched archive + uses: actions/upload-artifact@v2 + with: + name: wsjtx-jammy-package + path: wsjtx_2.5.4_jammy_amd64.deb + + release_draft: + needs: ['build_focal' , 'build_jammy' , 'build_rpi32' , 'build_rpi64'] + runs-on: ubuntu-latest + steps: + - name: Download artifacts + uses: actions/download-artifact@v2 + + - name: Release draft + uses: actions/create-release@v1 + id: create_release_draft + with: + draft: true + prerelease: true + release_name: Development build ${{ github.run_number }} + tag_name: ${{ github.ref }} + body: | + Automatic build on push. This is not a release. + env: + GITHUB_TOKEN: ${{ github.token }} + + - name: upload focal 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-focal-package/wsjtx_2.5.4_focal_amd64.deb + asset_name: wsjtx_2.5.4_focal_amd64.deb + asset_content_type: application/gzip + + - name: upload jammy 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-jammy-package/wsjtx_2.5.4_jammy_amd64.deb + 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-rpi32-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: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release_draft.outputs.upload_url }} + asset_path: wsjtx-patched-code/wsjtx-patched-2.5.4.tgz + asset_name: wsjtx-patched-2.5.4.tgz + asset_content_type: application/gzip -# build_focal: -# 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/ubuntu_focal && docker build . --tag ubuntu_focal_build -# -# - name: Run Container -# run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_focal_build /build/docker/ubuntu_focal/build.sh -# -# - name: Upload new patched archive -# uses: actions/upload-artifact@v2 -# with: -# name: wsjtx-focal-package -# path: wsjtx_2.5.4_focal_amd64.deb -# -# build_jammy: -# 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/ubuntu_jammy && docker build . --tag ubuntu_jammy_build -# -# - name: Run Container -# run: docker run -t -v $GITHUB_WORKSPACE:/build -w /build ubuntu_jammy_build /build/docker/ubuntu_jammy/build.sh -# -# - name: Upload new patched archive -# uses: actions/upload-artifact@v2 -# with: -# name: wsjtx-jammy-package -# path: wsjtx_2.5.4_jammy_amd64.deb -# - -# release_draft: -# needs: ['build_focal' , 'build_jammy'] -# runs-on: ubuntu-latest -# steps: -# - name: Download artifacts -# uses: actions/download-artifact@v2 -# -# - name: Release draft -# uses: actions/create-release@v1 -# id: create_release_draft -# with: -# draft: true -# prerelease: true -# release_name: Development build ${{ github.run_number }} -# tag_name: ${{ github.ref }} -# body: | -# Automatic build on push. This is not a release. -# env: -# GITHUB_TOKEN: ${{ github.token }} -# -# - name: upload focal 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-focal-package/wsjtx_2.5.4_focal_amd64.deb -# asset_name: wsjtx_2.5.4_focal_amd64.deb -# asset_content_type: application/gzip -# -# - name: upload jammy 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-jammy-package/wsjtx_2.5.4_jammy_amd64.deb -# asset_name: wsjtx_2.5.4_jammy_amd64.deb -# asset_content_type: application/gzip -# -# - name: upload patched source code -# uses: actions/upload-release-asset@v1 -# env: -# GITHUB_TOKEN: ${{ github.token }} -# with: -# upload_url: ${{ steps.create_release_draft.outputs.upload_url }} -# asset_path: wsjtx-patched-code/wsjtx-patched-2.5.4.tgz -# asset_name: wsjtx-patched-2.5.4.tgz -# asset_content_type: application/gzip -# - -# clean_artifacts: -# needs: ['release_draft'] -# runs-on: ubuntu-latest -# steps: -# - name: Delete Artifact -# uses: GeekyEggo/delete-artifact@v1.0.0 -# with: -# name: | -# wsjtx-patched-code -# wsjtx-source-code -# wsjtx-focal-package -# wsjtx-jammy-package + clean_artifacts: + needs: ['release_draft'] + runs-on: ubuntu-latest + steps: + - name: Delete Artifact + uses: GeekyEggo/delete-artifact@v1.0.0 + with: + name: | + wsjtx-patched-code + 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 index 7fcc220..a476cd3 100644 --- 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-rpi32-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/docker/ubuntu_focal/build.sh b/docker/ubuntu_focal/build.sh index efd3055..d77424c 100755 --- 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 \ No newline at end of file diff --git a/docker/ubuntu_jammy/build.sh b/docker/ubuntu_jammy/build.sh index 8016a1c..5f5a09f 100755 --- 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 From 364e5d0b085c340a9c7219934c306769e5a1b73d Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 13:45:20 +0200 Subject: [PATCH 8/9] fixed path for rpi64 package, updated README --- .github/workflows/release.yml | 2 +- README.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a476cd3..4975606 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -218,7 +218,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release_draft.outputs.upload_url }} - asset_path: wsjtx-rpi32-package/wsjtx_2.5.4_arm64.deb + asset_path: wsjtx-rpi64-package/wsjtx_2.5.4_arm64.deb asset_name: wsjtx_2.5.4_arm64.deb asset_content_type: application/gzip diff --git a/README.md b/README.md index 6259388..33b63e8 100644 --- 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) From cf87b10db180517f856c8c70b3746fbf252fbda9 Mon Sep 17 00:00:00 2001 From: d3cker Date: Wed, 5 Oct 2022 14:40:49 +0200 Subject: [PATCH 9/9] another fixed typo. I think i need some validators and tests --- .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 e79c86e..9b5e1ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -217,7 +217,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release_draft.outputs.upload_url }} - asset_path: wsjtx-rpi32-package/wsjtx_2.5.4_arm64.deb + asset_path: wsjtx-rpi64-package/wsjtx_2.5.4_arm64.deb asset_name: wsjtx_2.5.4_arm64.deb asset_content_type: application/gzip