updated build process

.github/workflows/build_gui.yml

@@ -0,0 +1,37 @@
+name: build_gui
+on: [push]
+
+jobs:
+  build_i686_x64_release:
+    name: Build FreeDATA GUI
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-latest]
+        include:
+          - os: ubuntu-20.04
+            electron_parameters: "-p always"
+
+          - os: macos-latest
+            electron_parameters: "-p always"
+
+          - os: windows-latest
+            electron_parameters: "-p always --x64 --ia32"
+
+    steps:
+      - name: Checkout code for ${{ matrix.platform.name }}
+        uses: actions/checkout@v4
+        with:
+          repository: DJ2LS/FreeDATA
+      - name: Electron Builder
+        env: # Setting environment variables for the entire job
+          GH_TOKEN: ${{ secrets.github_token }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        working-directory: gui
+        run: |
+          npm i
+          npm run release

.github/workflows/build_multiplatform.yml

@@ -1,351 +0,0 @@
-name: Build_Multiplatform
-on: [push]
-
-jobs:
-  BUILD_AMD64:
-    name: Build codec2 for x86/x64 devices
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-latest, macos-12]
-        platform: [{name: "native"}, {name: "Windows", file: "dll"}]
-        architecture: [i686-w64-mingw32, x86_64-w64-mingw32]
-        include:
-
-          - os: ubuntu-20.04
-            libcodec2_name: libcodec2.so.1.2
-            libcodec2_os_name: libcodec2_ubuntu-2004
-            libcodec2_filetype: so
-            generator: Unix Makefiles
-            shell: bash
-
-          - os: ubuntu-22.04
-            libcodec2_name: libcodec2.so.1.2
-            libcodec2_os_name: libcodec2_ubuntu-2204
-            libcodec2_filetype: so
-            generator: Unix Makefiles
-            shell: bash
-
-          - os: macos-latest
-            libcodec2_name: libcodec2.1.2.dylib
-            libcodec2_os_name: libcodec2_macos-latest
-            libcodec2_filetype: dylib
-            generator: Unix Makefiles
-            shell: bash
-
-          - os: macos-12
-            libcodec2_name: libcodec2.1.2.dylib
-            libcodec2_os_name: libcodec2_macos-12
-            libcodec2_filetype: dylib
-            generator: Unix Makefiles
-            shell: bash
-
-
-    steps:
-      - name: Build codec2 on ${{ matrix.os }} for ${{ matrix.platform.name }}
-        if: ${{startsWith(matrix.platform.name, 'native') }}
-        run: |
-          git clone https://github.com/drowe67/codec2.git
-          cd codec2
-          mkdir build
-          mkdir tempfiles
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ../
-          make
-          mv src/${{ matrix.libcodec2_name }} ../tempfiles/libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}.${{ matrix.libcodec2_filetype }}
-
-      - name: LIST ALL FILES ${{ github.workspace }}
-        run: ls -R ${{ github.workspace }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{startsWith(matrix.platform.name, 'native') }}
-        with:
-          name: libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}.${{ matrix.libcodec2_filetype }}
-          # path: ${{ github.workspace }}/codec2/tempfiles/libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}.${{ matrix.libcodec2_filetype }}
-          path: ${{ github.workspace }}/codec2/tempfiles/
-
-
-      - name: Build codec2 ${{ matrix.platform.name }} ${{ matrix.architecture }}
-        if: ${{startsWith(matrix.os, 'ubuntu-20') && !startsWith(matrix.platform.name, 'native') }}
-        run: |
-          sudo apt install build-essential mingw-w64 g++-mingw-w64 make cmake
-          git clone https://github.com/drowe67/codec2.git
-          cd codec2
-          mkdir tempfiles
-          mkdir build_w32
-          cd build_w32
-          echo 'set(CMAKE_SYSTEM_NAME ${{ matrix.platform.name }})' > toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_C_COMPILER ${{ matrix.architecture }}-gcc)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_CXX_COMPILER ${{ matrix.architecture }}-g++)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_RC_COMPILER ${{ matrix.architecture }}-windres)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_FIND_ROOT_PATH /usr/${{ matrix.architecture }})' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)' >> toolchain-ubuntu-mingw32.cmake
-          echo 'set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")' >> toolchain-ubuntu-mingw32.cmake
-          cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain-ubuntu-mingw32.cmake ..
-          make
-          mv src/libcodec2.${{ matrix.platform.file }} ../tempfiles/libcodec2_${{ matrix.platform.name }}_${{ matrix.architecture }}.${{ matrix.platform.file }}
-
-      - uses: actions/upload-artifact@v3
-        if: ${{startsWith(matrix.os, 'ubuntu-20') && !startsWith(matrix.platform.name, 'native') }}
-        with:
-          name: libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}_${{ matrix.architecture }}.${{ matrix.platform.file }}
-          path: codec2/tempfiles/*
-
-  BUILD_ARM:
-    # The host should always be linux
-    runs-on: ubuntu-latest
-    name: Build codec2 for ARM devices
-
-    # Run steps on a matrix of 2 arch/distro combinations
-    strategy:
-      matrix:
-        include:
-          - arch: armv7
-            distro: bullseye
-            libcodec2_os_name: libcodec2_bullseye_armv7.so
-          - arch: armv7
-            distro: ubuntu_latest
-            libcodec2_os_name: libcodec2_ubuntu_latest_armv7.so
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - uses: uraimo/run-on-arch-action@v2
-        name: Build artifact
-        id: build
-        with:
-          arch: ${{ matrix.arch }}
-          distro: ${{ matrix.distro }}
-
-          # Not required, but speeds up builds
-          githubToken: ${{ github.token }}
-
-          # Create an artifacts directory
-          setup: |
-            mkdir -p "${PWD}/artifacts"
-
-          # Mount the artifacts directory as /artifacts in the container
-          dockerRunArgs: |
-            --volume "${PWD}/artifacts:/artifacts"
-
-          # Pass some environment variables to the container
-          env: | # YAML, but pipe character is necessary
-            artifact_name: ${{ matrix.libcodec2_os_name }}
-
-          # The shell to run commands with in the container
-          shell: /bin/sh
-
-          # Install some dependencies in the container. This speeds up builds if
-          # you are also using githubToken. Any dependencies installed here will
-          # be part of the container image that gets cached, so subsequent
-          # builds don't have to re-install them. The image layer is cached
-          # publicly in your project's package repository, so it is vital that
-          # no secrets are present in the container state or logs.
-          install: |
-            case "${{ matrix.distro }}" in
-              ubuntu*|jessie|stretch|buster|bullseye)
-                apt-get update -q -y
-                apt-get install -q -y git build-essential cmake gcc g++
-                cmake --version
-                ;;
-              fedora*)
-                dnf -y update
-                dnf -y install git which make cmake gcc-c++ gcc
-                cmake --version
-                ;;
-              alpine*)
-                apk update
-                apk add git cmake gcc g++
-                cmake --version
-                ;;
-            esac
-
-          # Produce a binary artifact and place it in the mounted volume
-          run: |
-
-            git clone https://github.com/drowe67/codec2.git
-            cd codec2
-            git checkout main
-            mkdir build
-            cd build
-            cmake ../
-            make
-            mv ./src/libcodec2.so.1.2 /artifacts/${artifact_name}
-
-      - name: Show recursive PWD/artifacts
-        # Items placed in /artifacts in the container will be in
-        # ${PWD}/artifacts on the host.
-        run: ls -al "${PWD}/artifacts"
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.libcodec2_os_name }}
-          #path: $GITHUB_WORKSPACE/codec2/artifacts/*
-          path: artifacts/*
-
-  build_i686_x64_release:
-    needs: [BUILD_AMD64, BUILD_ARM]
-    name: Build FreeDATA packages
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
-        include:
-          - os: ubuntu-20.04
-            zip_name: ubuntu_modem
-            generator: Unix Makefiles
-            daemon_binary_name: freedata-daemon
-            modem_binary_name: freedata-modem
-            electron_parameters: "-p always"
-
-          - os: macos-latest
-            zip_name: macos_modem
-            generator: Unix Makefiles
-            daemon_binary_name: freedata-daemon
-            modem_binary_name: freedata-modem
-            electron_parameters: "-p always"
-
-          - os: windows-latest
-            zip_name: windows_modem
-            generator: Visual Studio 16 2019
-            daemon_binary_name: freedata-daemon.exe
-            modem_binary_name: freedata-modem.exe
-            electron_parameters: "-p always --x64 --ia32"
-    steps:
-      - name: Checkout code for ${{ matrix.platform.name }}
-        uses: actions/checkout@v4
-        with:
-          repository: DJ2LS/FreeDATA
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-
-      - name: Install Node.js, NPM and Yarn
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.17
-
-      - name: Create modem/dist
-        working-directory: modem
-        run: |
-          mkdir -p dist
-
-      - name: Create modem/dist/modem
-        working-directory: modem
-        run: |
-          mkdir -p dist/modem
-
-      ##- name: Download libcodec2 artifact Modem DIST
-      ##  uses: actions/download-artifact@v3
-      ##  with:
-      ##    path: modem/dist/codec2
-
-      - name: create modem/lib/codec2
-        working-directory: modem/lib/
-        run: |
-          mkdir codec2
-
-      - name: Download libcodec2 artifact Modem LIB
-        uses: actions/download-artifact@v3
-        with:
-          path: modem/lib/codec2
-
-
-      - name: Install Linux dependencies
-        # if: matrix.os == 'ubuntu-20.04'
-        if: ${{startsWith(matrix.os, 'ubuntu')}}
-        run: |
-          sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 patchelf
-
-      - name: Install MacOS pyAudio
-        if: ${{startsWith(matrix.os, 'macos')}}
-        run: |
-          brew install portaudio
-          python -m pip install --upgrade pip
-          pip3 install pyaudio
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Add MacOS certs
-        if: ${{startsWith(matrix.os, 'macos')}}
-        run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh
-        env:
-          CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
-          CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
-
-      - name: Build binaries Linux and Windows
-        working-directory: modem
-        run: |
-          python3 -m nuitka --enable-plugin=numpy --remove-output --assume-yes-for-downloads --standalone server.py
-
-      - name: LIST ALL FILES
-        run: ls -R
-
-      - name: Download Portaudio binaries Linux macOS
-        if: ${{!startsWith(matrix.os, 'windows')}}
-        working-directory: modem
-        run: |
-          if ! test -d "server.dist/modem/_sounddevice_data"; then
-          git clone https://github.com/spatialaudio/portaudio-binaries dist/modem/_sounddevice_data/portaudio-binaries
-          fi
-
-      - name: Download Portaudio binaries Windows
-        if: ${{startsWith(matrix.os, 'windows')}}
-        working-directory: modem
-        run: |
-          if(Test-Path -Path "server.dist/modem/_sounddevice_data"){
-          echo "sounddevice folder already exists"
-          } else {
-          git clone https://github.com/spatialaudio/portaudio-binaries dist/modem/_sounddevice_data/portaudio-binaries
-          }
-
-      - name: LIST ALL FILES
-        run: ls -R
-
-      - name: cleanup on macos before code signing
-        if: ${{startsWith(matrix.os, 'macos')}}
-        run: |
-          ls -l
-          # find . -type d -name .git -exec rm -r {} \;
-          find . -type d -o -name ".git" -delete
-
-      - name: Electron Builder
-        env: # Setting environment variables for the entire job
-          GH_TOKEN: ${{ secrets.github_token }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        working-directory: gui
-        run: |
-          npm i
-          npm run release
-
-      - name: Compress Modem
-        uses: thedoctor0/zip-release@master
-        with:
-            type: 'zip'
-            filename: '${{ matrix.zip_name }}.zip'
-            directory: ./modem/server.dist
-            path: .
-            # exclusions: '*.git* /*node_modules/* .editorconfig'
-
-      - name: Release Modem
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/v')
-        with:
-          draft: true
-          files: ./modem/server.dist/${{ matrix.zip_name }}.zip
-
-      - name: LIST ALL FILES
-        run: ls -R

.github/workflows/build_server.yml

@@ -0,0 +1,124 @@
+name: Build_Multiplatform
+on: [push]
+
+jobs:
+  build_i686_x64_release:
+    name: Build FreeDATA packages
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-latest]
+        include:
+          - os: ubuntu-20.04
+            zip_name: ubuntu_modem
+            generator: Unix Makefiles
+            modem_binary_name: freedata-server
+
+          - os: macos-latest
+            zip_name: macos_modem
+            generator: Unix Makefiles
+            modem_binary_name: freedata-server
+
+          - os: windows-latest
+            zip_name: windows_modem
+            generator: Visual Studio 16 2019
+            modem_binary_name: freedata-server.exe
+
+    steps:
+      - name: Checkout code for ${{ matrix.platform.name }}
+        uses: actions/checkout@v4
+        with:
+          repository: DJ2LS/FreeDATA
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: Create modem/dist
+        working-directory: modem
+        run: |
+          mkdir -p dist
+
+      - name: Create modem/dist/modem
+        working-directory: modem
+        run: |
+          mkdir -p dist/modem
+
+      - name: Install Linux dependencies
+        # if: matrix.os == 'ubuntu-20.04'
+        if: ${{startsWith(matrix.os, 'ubuntu')}}
+        run: |
+          sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 patchelf
+
+      - name: Install MacOS pyAudio
+        if: ${{startsWith(matrix.os, 'macos')}}
+        run: |
+          brew install portaudio
+          python -m pip install --upgrade pip
+          pip3 install pyaudio
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Add MacOS certs
+        if: ${{startsWith(matrix.os, 'macos')}}
+        run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh
+        env:
+          CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
+          CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
+
+      - name: Build binaries
+        working-directory: modem
+        run: |
+          python3 -m nuitka --enable-plugin=numpy --remove-output --assume-yes-for-downloads --standalone server.py
+
+      - name: Download Portaudio binaries Linux macOS
+        if: ${{!startsWith(matrix.os, 'windows')}}
+        working-directory: modem
+        run: |
+          if ! test -d "server.dist/modem/_sounddevice_data"; then
+          git clone https://github.com/spatialaudio/portaudio-binaries dist/modem/_sounddevice_data/portaudio-binaries
+          fi
+
+      - name: Download Portaudio binaries Windows
+        if: ${{startsWith(matrix.os, 'windows')}}
+        working-directory: modem
+        run: |
+          if(Test-Path -Path "server.dist/modem/_sounddevice_data"){
+          echo "sounddevice folder already exists"
+          } else {
+          git clone https://github.com/spatialaudio/portaudio-binaries dist/modem/_sounddevice_data/portaudio-binaries
+          }
+
+      - name: LIST ALL FILES
+        run: ls -R
+
+      - name: cleanup on macos before code signing
+        if: ${{startsWith(matrix.os, 'macos')}}
+        run: |
+          ls -l
+          # find . -type d -name .git -exec rm -r {} \;
+          find . -type d -o -name ".git" -delete
+
+      - name: Compress Modem
+        uses: thedoctor0/zip-release@master
+        with:
+            type: 'zip'
+            filename: '${{ matrix.zip_name }}.zip'
+            directory: ./modem/server.dist
+            path: .
+            # exclusions: '*.git* /*node_modules/* .editorconfig'
+
+      - name: Release Modem
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          draft: true
+          files: ./modem/server.dist/${{ matrix.zip_name }}.zip
+
+      - name: LIST ALL FILES
+        run: ls -R