From 0ef2d601dd382265d355015b591bcd50a4a33d95 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 16:06:57 +0200 Subject: [PATCH 01/13] first nuitka test run --- .github/workflows/build_multiplatform.yml | 34 +++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index f90823bf..91291bd9 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -228,7 +228,7 @@ jobs: run: | sudo apt install portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 - - name: Install macOS dependencies + - name: Install macOS pyAudio if: matrix.os == 'macos-11' run: | brew install portaudio @@ -249,6 +249,8 @@ jobs: pip install sounddevice # curl.exe --output PyAudio-0.2.11-cp39-cp39-win_amd64.whl --url https://download.lfd.uci.edu/pythonlibs/y2rycu7g/PyAudio-0.2.11-cp39-cp39-win_amd64.whl # pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl + pip install nuitka + pip install ordered-set - name: Install Pyaudio Windows @@ -279,10 +281,15 @@ jobs: - name: Display structure of downloaded files run: ls -R - - name: Build Linux Daemon + - name: Build Linux binaries working-directory: tnc run: | - pyinstaller freedata.spec + #pyinstaller freedata.spec + python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o freedata-daemon + python3 -m nuitka --enable-plugin=numpy --onefile main.py -o freedata-tnc + mkdir dist + cp freedata-daemon dist/ + cp freedata-tnc dist/ - name: LIST ALL FILES shell: bash @@ -296,12 +303,20 @@ jobs: # cd ./tnc/dist # zip -r ./${{ matrix.zip_name }}.zip * + - name: Copy TNC to GUI Linux + run: | + #cp -R ./tnc/dist/tnc ./gui/tnc + cp -R ./tnc/dist ./gui/tnc + ls -R + + - name: Compress TNC uses: thedoctor0/zip-release@master with: type: 'zip' filename: '${{ matrix.zip_name }}.zip' - directory: ./tnc/dist/tnc + #directory: ./tnc/dist/tnc + directory: ./tnc/dist path: . #exclusions: '*.git* /*node_modules/* .editorconfig' @@ -314,12 +329,8 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ matrix.zip_name }}.zip - path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip - - - name: Copy TNC to GUI Linux - run: | - cp -R ./tnc/dist/tnc ./gui/tnc - ls -R + #path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + path: ./tnc/dist/${{ matrix.zip_name }}.zip - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v1 @@ -330,7 +341,8 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: - files: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + #files: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + files: ./tnc/dist/${{ matrix.zip_name }}.zip - name: Build/release Electron app From 449ce0712c999bb8f52d18890f5f0128472ca370 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 16:18:08 +0200 Subject: [PATCH 02/13] another approach of running arm build --- .github/workflows/build_multiplatform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 91291bd9..93e86423 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -103,7 +103,7 @@ jobs: BUILD_ON_MULTIARCH: # The host should always be linux - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: Build on ${{ matrix.distro }} ${{ matrix.arch }} # Run steps on a matrix of 3 arch/distro combinations @@ -114,8 +114,8 @@ jobs: distro: bullseye libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so - arch: armv7 - distro: ubuntu20.04 - libcodec2_os_name: libcodec2_ubuntu-2004_armv7.so + distro: ubuntu-latest + libcodec2_os_name: libcodec2_ubuntu-latest_armv7.so steps: - uses: actions/checkout@v2.1.0 From 7918a3549051494ce01ece1d20e28133530a0550 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 16:20:46 +0200 Subject: [PATCH 03/13] disabled ubuntu arm build --- .github/workflows/build_multiplatform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 93e86423..7fbbdd19 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -113,9 +113,9 @@ jobs: - arch: armv7 distro: bullseye libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so - - arch: armv7 - distro: ubuntu-latest - libcodec2_os_name: libcodec2_ubuntu-latest_armv7.so + #- arch: armv7 + # distro: ubuntu20.04 + # libcodec2_os_name: libcodec2_ubuntu-2004_armv7.so steps: - uses: actions/checkout@v2.1.0 From 9d9c6228a43d4e0c11ac444b4c5a33cadda955bc Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 16:22:08 +0200 Subject: [PATCH 04/13] changed arm ubuntu build again... --- .github/workflows/build_multiplatform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 7fbbdd19..b5e938a6 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -113,9 +113,9 @@ jobs: - arch: armv7 distro: bullseye libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so - #- arch: armv7 - # distro: ubuntu20.04 - # libcodec2_os_name: libcodec2_ubuntu-2004_armv7.so + - arch: armv7 + distro: ubuntu_latest + libcodec2_os_name: libcodec2_ubuntu-latest_armv7.so steps: - uses: actions/checkout@v2.1.0 From 0856de449b542f616daea395bdd34b6806c8d8cc Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 17:02:11 +0200 Subject: [PATCH 05/13] fixed binary cp for windows --- .github/workflows/build_multiplatform.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index b5e938a6..6b8ca43e 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -190,7 +190,8 @@ jobs: - uses: actions/upload-artifact@v3 with: name: ${{ matrix.libcodec2_os_name }} - path: $GITHUB_WORKSPACE/codec2/artifacts/* + #path: $GITHUB_WORKSPACE/codec2/artifacts/* + path: ${PWD}/artifacts/* build_i686_x64_release: needs: [BUILD_ON_MULTIARCH, BUILD_ON_AMD64] @@ -203,14 +204,20 @@ jobs: - os: ubuntu-20.04 zip_name: ubuntu_tnc generator: Unix Makefiles + daemon_binary_name: freedata-daemon + tnc_binary_name: freedata-tnc - os: macos-11 zip_name: macos_tnc generator: Unix Makefiles + daemon_binary_name: freedata-daemon + tnc_binary_name: freedata-tnc - os: windows-latest zip_name: windows_tnc generator: Visual Studio 16 2019 + daemon_binary_name: freedata-daemon.exe + tnc_binary_name: freedata-tnc.exe steps: - name: Checkout code uses: actions/checkout@v3 @@ -288,8 +295,14 @@ jobs: python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o freedata-daemon python3 -m nuitka --enable-plugin=numpy --onefile main.py -o freedata-tnc mkdir dist - cp freedata-daemon dist/ - cp freedata-tnc dist/ + cp ${{ matrix.daemon_binary_name }} dist/ + cp ${{ matrix.tnc_binary_name }} dist/ + + - name: Install Pyaudio Windows + if: matrix.os == 'windows-latest' + working-directory: tnc/lib/pyaudio/windows + run: | + pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl - name: LIST ALL FILES shell: bash From 4af4a3eebcdd956611ebb3845c84ca76ac8557a6 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 17:05:32 +0200 Subject: [PATCH 06/13] fixed binary cp for windows --- .github/workflows/build_multiplatform.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 6b8ca43e..67482972 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -292,9 +292,10 @@ jobs: working-directory: tnc run: | #pyinstaller freedata.spec - python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o freedata-daemon - python3 -m nuitka --enable-plugin=numpy --onefile main.py -o freedata-tnc + python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o ${{ matrix.daemon_binary_name }} + python3 -m nuitka --enable-plugin=numpy --onefile main.py -o ${{ matrix.tnc_binary_name }} mkdir dist + ls -R cp ${{ matrix.daemon_binary_name }} dist/ cp ${{ matrix.tnc_binary_name }} dist/ From fa9320df3e43d7bef0024aca21a51f5ec389987e Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 19:07:00 +0200 Subject: [PATCH 07/13] fixed artifact path --- .github/workflows/build_multiplatform.yml | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 67482972..bb88a549 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -112,10 +112,10 @@ jobs: include: - arch: armv7 distro: bullseye - libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so + libcodec2_os_name: libcodec2_bullseye_armv7.so - arch: armv7 distro: ubuntu_latest - libcodec2_os_name: libcodec2_ubuntu-latest_armv7.so + libcodec2_os_name: libcodec2_ubuntu_latest_armv7.so steps: - uses: actions/checkout@v2.1.0 @@ -139,7 +139,7 @@ jobs: # Pass some environment variables to the container env: | # YAML, but pipe character is necessary - artifact_name: libcodec2_${{ matrix.distro }}_${{ matrix.arch }}.so + artifact_name: ${{ matrix.libcodec2_os_name }} # The shell to run commands with in the container shell: /bin/sh @@ -179,19 +179,25 @@ jobs: cd build cmake ../ make - mv ./src/libcodec2.so.1.0 /artifacts/${artifact_name} + mv ./src/libcodec2.so.1.0 /artifacts/${ matrix.libcodec2_os_name } - - name: Show the artifact + - name: Show recursive PWD # Items placed in /artifacts in the container will be in # ${PWD}/artifacts on the host. run: | ls -al "${PWD}/artifacts" + - name: Show recursive GITHUB WORKSPACE + # Items placed in /artifacts in the container will be in + # ${PWD}/artifacts on the host. + run: | + ls -R "${$GITHUB_WORKSPACE}/" + - uses: actions/upload-artifact@v3 with: name: ${{ matrix.libcodec2_os_name }} #path: $GITHUB_WORKSPACE/codec2/artifacts/* - path: ${PWD}/artifacts/* + path: artifacts/* build_i686_x64_release: needs: [BUILD_ON_MULTIARCH, BUILD_ON_AMD64] @@ -216,8 +222,8 @@ jobs: - os: windows-latest zip_name: windows_tnc generator: Visual Studio 16 2019 - daemon_binary_name: freedata-daemon.exe - tnc_binary_name: freedata-tnc.exe + daemon_binary_name: daemon.dist\freedata-daemon.exe + tnc_binary_name: main.dist\freedata-tnc.exe steps: - name: Checkout code uses: actions/checkout@v3 @@ -288,7 +294,7 @@ jobs: - name: Display structure of downloaded files run: ls -R - - name: Build Linux binaries + - name: Build binaries working-directory: tnc run: | #pyinstaller freedata.spec From 80a640d9df58fcc38ca0a70a99f4c4af030b1860 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Tue, 6 Sep 2022 20:19:30 +0200 Subject: [PATCH 08/13] more github action changes. Last run for this month... --- .github/workflows/build_multiplatform.yml | 27 ++++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index bb88a549..abd443d1 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -179,7 +179,7 @@ jobs: cd build cmake ../ make - mv ./src/libcodec2.so.1.0 /artifacts/${ matrix.libcodec2_os_name } + mv ./src/libcodec2.so.1.0 /artifacts/${artifact_name} - name: Show recursive PWD # Items placed in /artifacts in the container will be in @@ -187,11 +187,6 @@ jobs: run: | ls -al "${PWD}/artifacts" - - name: Show recursive GITHUB WORKSPACE - # Items placed in /artifacts in the container will be in - # ${PWD}/artifacts on the host. - run: | - ls -R "${$GITHUB_WORKSPACE}/" - uses: actions/upload-artifact@v3 with: @@ -222,8 +217,8 @@ jobs: - os: windows-latest zip_name: windows_tnc generator: Visual Studio 16 2019 - daemon_binary_name: daemon.dist\freedata-daemon.exe - tnc_binary_name: main.dist\freedata-tnc.exe + daemon_binary_name: freedata-daemon.exe + tnc_binary_name: freedata-tnc.exe steps: - name: Checkout code uses: actions/checkout@v3 @@ -300,11 +295,27 @@ jobs: #pyinstaller freedata.spec python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o ${{ matrix.daemon_binary_name }} python3 -m nuitka --enable-plugin=numpy --onefile main.py -o ${{ matrix.tnc_binary_name }} + + + - name: Copy binaries unix linux + if: matrix.os != 'windows-latest' + working-directory: tnc + run: | mkdir dist ls -R cp ${{ matrix.daemon_binary_name }} dist/ cp ${{ matrix.tnc_binary_name }} dist/ + - name: Copy binaries windows + if: matrix.os == 'windows-latest' + working-directory: tnc + run: | + mkdir dist + ls -R + cp daemon.dist\${{ matrix.daemon_binary_name }} dist/ + cp daemon.dist\${{ matrix.tnc_binary_name }} dist/ + + - name: Install Pyaudio Windows if: matrix.os == 'windows-latest' working-directory: tnc/lib/pyaudio/windows From 1680dd368fe30523c35819425dd18d47f888a7b9 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Tue, 6 Sep 2022 21:31:44 +0200 Subject: [PATCH 09/13] allow dependency walker download --assume-yes-for-downloads option --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index abd443d1..a4baf3ed 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -293,8 +293,8 @@ jobs: working-directory: tnc run: | #pyinstaller freedata.spec - python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o ${{ matrix.daemon_binary_name }} - python3 -m nuitka --enable-plugin=numpy --onefile main.py -o ${{ matrix.tnc_binary_name }} + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile daemon.py -o ${{ matrix.daemon_binary_name }} + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile main.py -o ${{ matrix.tnc_binary_name }} - name: Copy binaries unix linux From c93aff011b4683ab39035c927f39be5d123476f9 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Tue, 6 Sep 2022 22:07:57 +0200 Subject: [PATCH 10/13] fixe Windows Build path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …this is hopefully the final commit in this area… --- .github/workflows/build_multiplatform.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index a4baf3ed..42463222 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -297,23 +297,13 @@ jobs: python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile main.py -o ${{ matrix.tnc_binary_name }} - - name: Copy binaries unix linux - if: matrix.os != 'windows-latest' + - name: Copy binaries working-directory: tnc run: | mkdir dist ls -R cp ${{ matrix.daemon_binary_name }} dist/ cp ${{ matrix.tnc_binary_name }} dist/ - - - name: Copy binaries windows - if: matrix.os == 'windows-latest' - working-directory: tnc - run: | - mkdir dist - ls -R - cp daemon.dist\${{ matrix.daemon_binary_name }} dist/ - cp daemon.dist\${{ matrix.tnc_binary_name }} dist/ - name: Install Pyaudio Windows From d64d839ac55f9fb488ebd976fe410616c91eb762 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 8 Sep 2022 07:59:49 +0200 Subject: [PATCH 11/13] fix trailing whitespaces --- .github/workflows/build_multiplatform.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 42463222..4aa7b881 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -293,18 +293,27 @@ jobs: working-directory: tnc run: | #pyinstaller freedata.spec - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile daemon.py -o ${{ matrix.daemon_binary_name }} - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile main.py -o ${{ matrix.tnc_binary_name }} + python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o ${{ matrix.daemon_binary_name }} + python3 -m nuitka --enable-plugin=numpy --onefile main.py -o ${{ matrix.tnc_binary_name }} - - name: Copy binaries + - name: Copy binaries unix linux + if: matrix.os != 'windows-latest' working-directory: tnc run: | mkdir dist ls -R cp ${{ matrix.daemon_binary_name }} dist/ cp ${{ matrix.tnc_binary_name }} dist/ - + + - name: Copy binaries windows + if: matrix.os == 'windows-latest' + working-directory: tnc + run: | + mkdir dist + ls -R + cp daemon.dist\${{ matrix.daemon_binary_name }} dist/ + cp daemon.dist\${{ matrix.tnc_binary_name }} dist/ - name: Install Pyaudio Windows if: matrix.os == 'windows-latest' @@ -329,7 +338,6 @@ jobs: #cp -R ./tnc/dist/tnc ./gui/tnc cp -R ./tnc/dist ./gui/tnc ls -R - - name: Compress TNC uses: thedoctor0/zip-release@master From 22de69aefddb265589c746ac7aff3a406cdcbc27 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 8 Sep 2022 08:48:50 +0200 Subject: [PATCH 12/13] accidently removed --assume-yes-for-downloads --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 4aa7b881..e0b54bc7 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -293,8 +293,8 @@ jobs: working-directory: tnc run: | #pyinstaller freedata.spec - python3 -m nuitka --enable-plugin=numpy --onefile daemon.py -o ${{ matrix.daemon_binary_name }} - python3 -m nuitka --enable-plugin=numpy --onefile main.py -o ${{ matrix.tnc_binary_name }} + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile daemon.py -o ${{ matrix.daemon_binary_name }} + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile main.py -o ${{ matrix.tnc_binary_name }} - name: Copy binaries unix linux From 5d9dc98931cf81448abdcf462bc3656c4f845038 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 8 Sep 2022 10:27:01 +0200 Subject: [PATCH 13/13] and again a fix --- .github/workflows/build_multiplatform.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index e0b54bc7..7ec05517 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -297,8 +297,7 @@ jobs: python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --onefile main.py -o ${{ matrix.tnc_binary_name }} - - name: Copy binaries unix linux - if: matrix.os != 'windows-latest' + - name: Copy binaries working-directory: tnc run: | mkdir dist @@ -306,14 +305,6 @@ jobs: cp ${{ matrix.daemon_binary_name }} dist/ cp ${{ matrix.tnc_binary_name }} dist/ - - name: Copy binaries windows - if: matrix.os == 'windows-latest' - working-directory: tnc - run: | - mkdir dist - ls -R - cp daemon.dist\${{ matrix.daemon_binary_name }} dist/ - cp daemon.dist\${{ matrix.tnc_binary_name }} dist/ - name: Install Pyaudio Windows if: matrix.os == 'windows-latest'